Upstream changes from Android.

include/core/SkBitmap.h

Index: include/core/SkBitmap.h
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 9347bd93d8e3f529b908cc3d035c3bbbf89a1823..6c0abad24582649f5074f97728401bedf772c169 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -542,6 +542,16 @@ public:
     */
     int extractMipLevel(SkBitmap* dst, SkFixed sx, SkFixed sy);
 
+#ifdef SK_BUILD_FOR_ANDROID
+    bool hasHardwareMipMap() const {
+        return fHasHardwareMipMap;
+    }
+

[reed1, 2013/03/08 16:00:39]

A comment about what the heck this is would be nice, but not required (if you
don't know)

[djsollen, 2013/03/08 16:25:39]

Done.

+    void setHasHardwareMipMap(bool hasHardwareMipMap) {
+        fHasHardwareMipMap = hasHardwareMipMap;
+    }
+#endif
+
     bool extractAlpha(SkBitmap* dst) const {
         return this->extractAlpha(dst, NULL, NULL, NULL);
     }
@@ -652,6 +662,10 @@ private:
     uint8_t     fFlags;
     uint8_t     fBytesPerPixel; // based on config
 
+#ifdef SK_BUILD_FOR_ANDROID

[reed1, 2013/03/08 16:00:39]

Can this just be an added bit to Flags, so we don't have to add another field?
Should make updating operator== and operator= easier too.

[djsollen, 2013/03/08 16:25:39]

Done.

+    bool fHasHardwareMipMap;
+#endif
+
     /* Internal computations for safe size.
     */
     static Sk64 ComputeSafeSize64(Config   config,