Remove SkBitmap::[setH/h]asHardwareMipMap
These are no longer used by Android.
Change-Id: Ie3b9aa60af681f9e076a0d0680fc716ae51f9cd8
Reviewed-on: https://skia-review.googlesource.com/c/168486
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Auto-Submit: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
diff --git a/docs/SkBitmap_Reference.bmh b/docs/SkBitmap_Reference.bmh
index 8205834..43d33d2 100644
--- a/docs/SkBitmap_Reference.bmh
+++ b/docs/SkBitmap_Reference.bmh
@@ -2512,34 +2512,6 @@
# ------------------------------------------------------------------------------
-#Method bool hasHardwareMipMap() const
-#In Property
-#Line # returns Mip_Map support present; Android only ##
-#Populate
-
-#NoExample
-##
-
-#SeeAlso setHasHardwareMipMap
-
-##
-
-# ------------------------------------------------------------------------------
-
-#Method void setHasHardwareMipMap(bool hasHardwareMipMap)
-#In Set
-#Line # sets Mip_Map support present; Android only ##
-#Populate
-
-#NoExample
-##
-
-#SeeAlso hasHardwareMipMap
-
-##
-
-# ------------------------------------------------------------------------------
-
#Method bool extractAlpha(SkBitmap* dst) const
#In Constructors
#Line # creates Bitmap containing Alpha of pixels ##
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 978519d..1fd19f0 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -1063,28 +1063,6 @@
return this->writePixels(src, 0, 0);
}
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- /** For use by Android framework only.
-
- @return true if setHasHardwareMipMap() has been called with true
- */
- bool hasHardwareMipMap() const {
- return (fFlags & kHasHardwareMipMap_Flag) != 0;
- }
-
- /** For use by Android framework only.
-
- @param hasHardwareMipMap sets state
- */
- void setHasHardwareMipMap(bool hasHardwareMipMap) {
- if (hasHardwareMipMap) {
- fFlags |= kHasHardwareMipMap_Flag;
- } else {
- fFlags &= ~kHasHardwareMipMap_Flag;
- }
- }
-#endif
-
/** Sets dst to alpha described by pixels. Returns false if dst cannot be written to
or dst pixels cannot be allocated.
@@ -1188,13 +1166,6 @@
private:
enum Flags {
kImageIsVolatile_Flag = 0x02,
-#ifdef SK_BUILD_FOR_ANDROID
- /* A hint for the renderer responsible for drawing this bitmap
- * indicating that it should attempt to use mipmaps when this bitmap
- * is drawn scaled down.
- */
- kHasHardwareMipMap_Flag = 0x08,
-#endif
};
sk_sp<SkPixelRef> fPixelRef;
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index f596688..8aba794 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -579,9 +579,6 @@
SkASSERT(this->info().validRowBytes(this->rowBytes()));
uint8_t allFlags = kImageIsVolatile_Flag;
-#ifdef SK_BUILD_FOR_ANDROID
- allFlags |= kHasHardwareMipMap_Flag;
-#endif
SkASSERT((~allFlags & fFlags) == 0);
if (fPixelRef && fPixelRef->pixels()) {