Remove unused (Android-only) stable ID from SkPixelRef
Bug: skia:
Change-Id: Ibfe5d7e4c713bf637318f3e2ecc219495bd62879
Reviewed-on: https://skia-review.googlesource.com/c/160767
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 18f7103..c4d6baa 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -46,18 +46,6 @@
*/
uint32_t getGenerationID() const;
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- /** Returns a non-zero, unique value corresponding to this SkPixelRef.
- Unlike the generation ID, this ID remains the same even when the pixels
- are changed. IDs are not reused (until uint32_t wraps), so it is safe
- to consider this ID unique even after this SkPixelRef is deleted.
-
- Can be used as a key which uniquely identifies this SkPixelRef
- regardless of changes to its pixels or deletion of this object.
- */
- uint32_t getStableID() const { return fStableID; }
-#endif
-
/**
* Call this if you have changed the contents of the pixels. This will in-
* turn cause a different generation ID value to be returned from
@@ -113,10 +101,6 @@
bool genIDIsUnique() const { return SkToBool(fTaggedGenID.load() & 1); }
mutable std::atomic<uint32_t> fTaggedGenID;
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- const uint32_t fStableID;
-#endif
-
SkMutex fGenIDChangeListenersMutex;
SkTDArray<GenIDChangeListener*> fGenIDChangeListeners; // pointers are owned
diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index ac9e773..fdd3616 100644
--- a/src/core/SkPixelRef.cpp
+++ b/src/core/SkPixelRef.cpp
@@ -35,9 +35,6 @@
, fHeight(height)
, fPixels(pixels)
, fRowBytes(rowBytes)
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- , fStableID(SkNextID::ImageID())
-#endif
{
#ifdef SK_TRACE_PIXELREF_LIFETIME
SkDebugf(" pixelref %d\n", sk_atomic_inc(&gInstCounter));