commit d7cda4273e6b2dcca5bb9215121f5117fb261c18
author Mike Reed Fri Mar 27 06:20:34 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Mar 27 06:20:34 2009 -0700
tree 73d5abd6a23fb13e2976cecfbe5321ec10013b59
parent 60018267cf9b91fc4eb58ecb5b559b8dc5c454a7

AI 143089: promote bitmap width/height to 32bits
  allows browser to remove its Find hack workaround

Automated import of CL 143089

include/core/SkBitmap.h

diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 96c804d..5e7c44e 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -464,7 +464,8 @@
     };
 
     uint32_t    fRowBytes;
-    uint16_t    fWidth, fHeight;
+    uint32_t    fWidth;
+    uint32_t    fHeight;
     uint8_t     fConfig;
     uint8_t     fFlags;
     uint8_t     fBytesPerPixel; // based on config

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index bdc795f..c5d0eda 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -30,7 +30,7 @@
 struct MipLevel {
     void*       fPixels;
     uint32_t    fRowBytes;
-    uint16_t    fWidth, fHeight;
+    uint32_t    fWidth, fHeight;
 };
 
 struct SkBitmap::MipMap : SkNoncopyable {
@@ -132,9 +132,9 @@
     SkTSwap<MipMap*>(fMipMap, other.fMipMap);
 #endif
     SkTSwap<void*>(fPixels, other.fPixels);
-    SkTSwap<uint16_t>(fWidth, other.fWidth);
-    SkTSwap<uint16_t>(fHeight, other.fHeight);
     SkTSwap<uint32_t>(fRowBytes, other.fRowBytes);
+    SkTSwap<uint32_t>(fWidth, other.fWidth);
+    SkTSwap<uint32_t>(fHeight, other.fHeight);
     SkTSwap<uint8_t>(fConfig, other.fConfig);
     SkTSwap<uint8_t>(fFlags, other.fFlags);
     SkTSwap<uint8_t>(fBytesPerPixel, other.fBytesPerPixel);
@@ -225,8 +225,8 @@
         rowBytes = SkBitmap::ComputeRowBytes(c, width);
     }
     fConfig     = SkToU8(c);
-    fWidth      = SkToU16(width);
-    fHeight     = SkToU16(height);
+    fWidth      = width;
+    fHeight     = height;
     fRowBytes   = rowBytes;
 
     fBytesPerPixel = (uint8_t)ComputeBytesPerPixel(c);
@@ -891,8 +891,8 @@
         rowBytes = ComputeRowBytes(config, width);
 
         level[i].fPixels   = addr;
-        level[i].fWidth    = SkToU16(width);
-        level[i].fHeight   = SkToU16(height);
+        level[i].fWidth    = width;
+        level[i].fHeight   = height;
         level[i].fRowBytes = rowBytes;
 
         dstBM.setConfig(config, width, height, rowBytes);