remove SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF flag and code
Bug: skia:
Change-Id: I234d221d685a6feab891cbca84869177b4a954bb
Reviewed-on: https://skia-review.googlesource.com/11404
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 5a1036c..24d9071 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -440,25 +440,6 @@
*/
void setPixelRef(sk_sp<SkPixelRef>, int dx, int dy);
-#ifdef SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF
- /**
- * Assign a pixelref and origin to the bitmap. Pixelrefs are reference,
- * so the existing one (if any) will be unref'd and the new one will be
- * ref'd. (x,y) specify the offset within the pixelref's pixels for the
- * top/left corner of the bitmap. For a bitmap that encompases the entire
- * pixels of the pixelref, these will be (0,0).
- */
- SkPixelRef* setPixelRef(SkPixelRef* pr, int dx, int dy);
-
- SkPixelRef* setPixelRef(SkPixelRef* pr, const SkIPoint& origin) {
- return this->setPixelRef(pr, origin.fX, origin.fY);
- }
-
- SkPixelRef* setPixelRef(SkPixelRef* pr) {
- return this->setPixelRef(pr, 0, 0);
- }
-#endif
-
/** Call this to ensure that the bitmap points to the current pixel address
in the pixelref. Balance it with a call to unlockPixels(). These calls
are harmless if there is no pixelref.
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 0e22e30..b6e9ffa 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -215,13 +215,6 @@
}
}
-#ifdef SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF
-SkPixelRef* SkBitmap::setPixelRef(SkPixelRef* pr, int dx, int dy) {
- this->setPixelRef(sk_ref_sp(pr), dx, dy);
- return pr;
-}
-#endif
-
void SkBitmap::setPixelRef(sk_sp<SkPixelRef> pr, int dx, int dy) {
#ifdef SK_DEBUG
if (pr) {