Upstream changes from Android.

include/core/SkBitmap.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkBitmap_DEFINED
@@ skipping 524 matching lines @@
     bool hasMipMap() const;
     void buildMipMap(bool forceRebuild = false);
     void freeMipMap();
 
     /** Given scale factors sx, sy, determine the miplevel available in the
         bitmap, and return it (this is the amount to shift matrix iterators
         by). If dst is not null, it is set to the correct level.
     */
     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);
     }
 
     bool extractAlpha(SkBitmap* dst, const SkPaint* paint,
                       SkIPoint* offset) const {
         return this->extractAlpha(dst, paint, NULL, offset);
     }
 
     /** Set dst to contain alpha layer of this bitmap. If destination bitmap
@@ skipping 90 matching lines @@
         kImageIsImmutable_Flag  = 0x04
     };
 
     uint32_t    fRowBytes;
     uint32_t    fWidth;
     uint32_t    fHeight;
     uint8_t     fConfig;
     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,
                                   uint32_t width,
                                   uint32_t height,
                                   size_t   rowBytes);
     static size_t ComputeSafeSize(Config   config,
                                   uint32_t width,
                                   uint32_t height,
                                   size_t   rowBytes);
@@ skipping 111 matching lines @@
 
 // returns the address of the byte that contains the x coordinate
 inline uint8_t* SkBitmap::getAddr1(int x, int y) const {
     SkASSERT(fPixels);
     SkASSERT(fConfig == kA1_Config);
     SkASSERT((unsigned)x < fWidth && (unsigned)y < fHeight);
     return (uint8_t*)fPixels + y * fRowBytes + (x >> 3);
 }
 
 #endif