Remove legacy (and also broken) SkPicture constructor. R=robertphillips@google.com, reed@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/532703004
diff --git a/gyp/skia_for_android_framework_defines.gypi b/gyp/skia_for_android_framework_defines.gypi index e343680..191f5a6 100644 --- a/gyp/skia_for_android_framework_defines.gypi +++ b/gyp/skia_for_android_framework_defines.gypi
@@ -18,7 +18,6 @@ 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', # Transitional, for deprecated SkCanvas::SaveFlags methods. 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', - 'SK_SUPPORT_LEGACY_DEFAULT_PICTURE_CTOR', 'SK_LEGACY_PICTURE_SIZE_API', ], },
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 74d436b..2ea94c7 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h
@@ -62,10 +62,6 @@ typedef SkRefCnt INHERITED; }; -#ifdef SK_SUPPORT_LEGACY_DEFAULT_PICTURE_CTOR - SkPicture(); -#endif - /** PRIVATE / EXPERIMENTAL -- do not call */ void EXPERIMENTAL_addAccelData(const AccelData*) const;
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index 92551d3..6ae1c90 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp
@@ -252,15 +252,6 @@ /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_SUPPORT_LEGACY_DEFAULT_PICTURE_CTOR -// fRecord OK -SkPicture::SkPicture() - : fWidth(0) - , fHeight(0) { - this->needsNewGenID(); -} -#endif - // fRecord OK SkPicture::SkPicture(SkScalar width, SkScalar height, const SkPictureRecord& record,