commit f17ec8a5508a16f99566c65bfebf634319c88196
author Romain Guy <romainguy@google.com> Tue Oct 16 19:12:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 16 19:12:46 2012 -0700
tree a645510f9bdf95d6ec6b3f948281096b44cd1b9c
parent de3bba1bed0b34e1ac2255045ed1fa141889049d
parent 7cd90d4eecdba0f40a36945749d40df95d6d641b

am 7cd90d4e: Add Android specific API Bug #7353771

* commit '7cd90d4eecdba0f40a36945749d40df95d6d641b':
  Add Android specific API Bug #7353771

include/core/SkBitmap.h

diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 57b80e5..2d5fc41 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -513,6 +513,16 @@
     */
     int extractMipLevel(SkBitmap* dst, SkFixed sx, SkFixed sy);
 
+#ifdef SK_BUILD_FOR_ANDROID
+    bool hasHardwareMipMap() const {
+        return fHasHardwareMipMap;
+    }
+
+    void setHasHardwareMipMap(bool hasHardwareMipMap) {
+        fHasHardwareMipMap = hasHardwareMipMap;
+    }
+#endif
+
     bool extractAlpha(SkBitmap* dst) const {
         return this->extractAlpha(dst, NULL, NULL, NULL);
     }
@@ -614,6 +624,10 @@
     uint8_t     fFlags;
     uint8_t     fBytesPerPixel; // based on config
 
+#ifdef SK_BUILD_FOR_ANDROID
+    bool fHasHardwareMipMap;
+#endif
+
     /* Internal computations for safe size.
     */
     static Sk64 ComputeSafeSize64(Config config,