Revert "Revert of https://codereview.chromium.org/113823003/"

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 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.
  */
 
 
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkDither.h"
 #include "SkFlattenable.h"
 #include "SkImagePriv.h"
 #include "SkMallocPixelRef.h"
 #include "SkMask.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 #include "SkPixelRef.h"
 #include "SkThread.h"
 #include "SkUnPreMultiply.h"
 #include "SkUtils.h"
 #include "SkValidationUtils.h"
 #include "SkPackBits.h"
 #include <new>
 
-static bool isPos32Bits(const Sk64& value) {
-    return !value.isNeg() && value.is32();
-}
-
 struct MipLevel {
     void*       fPixels;
     uint32_t    fRowBytes;
     uint32_t    fWidth, fHeight;
 };
 
 struct SkBitmap::MipMap : SkNoncopyable {
     int32_t fRefCnt;
     int     fLevelCount;
 //  MipLevel    fLevel[fLevelCount];
 //  Pixels[]
 
     static MipMap* Alloc(int levelCount, size_t pixelSize) {
         if (levelCount < 0) {
             return NULL;
         }
-        Sk64 size;
-        size.setMul(levelCount + 1, sizeof(MipLevel));
-        size.add(sizeof(MipMap));
-        size.add(SkToS32(pixelSize));
-        if (!isPos32Bits(size)) {
+        int64_t size = (levelCount + 1) * sizeof(MipLevel);
+        size += sizeof(MipMap) + pixelSize;
+        if (!sk_64_isS32(size)) {
             return NULL;
         }
-        MipMap* mm = (MipMap*)sk_malloc_throw(size.get32());
+        MipMap* mm = (MipMap*)sk_malloc_throw(sk_64_asS32(size));
         mm->fRefCnt = 1;
         mm->fLevelCount = levelCount;
         return mm;
     }
 
     const MipLevel* levels() const { return (const MipLevel*)(this + 1); }
     MipLevel* levels() { return (MipLevel*)(this + 1); }
 
     const void* pixels() const { return levels() + fLevelCount; }
     void* pixels() { return levels() + fLevelCount; }
@@ skipping 113 matching lines @@
             break;
     }
     return bpp;
 }
 
 size_t SkBitmap::ComputeRowBytes(Config c, int width) {
     if (width < 0) {
         return 0;
     }
 
-    Sk64 rowBytes;
-    rowBytes.setZero();
+    int64_t rowBytes = 0;
 
     switch (c) {
         case kNo_Config:
             break;
         case kA8_Config:
         case kIndex8_Config:
-            rowBytes.set(width);
+            rowBytes = width;
             break;
         case kRGB_565_Config:
         case kARGB_4444_Config:
-            rowBytes.set(width);
-            rowBytes.shiftLeft(1);
+            rowBytes = width << 1;
             break;
         case kARGB_8888_Config:
-            rowBytes.set(width);
-            rowBytes.shiftLeft(2);
+            rowBytes = width << 2;
             break;
         default:
             SkDEBUGFAIL("unknown config");
             break;
     }
-    return isPos32Bits(rowBytes) ? rowBytes.get32() : 0;
+    return sk_64_isS32(rowBytes) ? sk_64_asS32(rowBytes) : 0;
 }
 
-Sk64 SkBitmap::ComputeSize64(Config c, int width, int height) {
-    Sk64 size;
-    size.setMul(SkToS32(SkBitmap::ComputeRowBytes(c, width)), height);
-    return size;
+int64_t SkBitmap::ComputeSize64(Config config, int width, int height) {
+    int64_t rowBytes = sk_64_mul(ComputeBytesPerPixel(config), width);
+    return rowBytes * height;
 }
 
 size_t SkBitmap::ComputeSize(Config c, int width, int height) {
-    Sk64 size = SkBitmap::ComputeSize64(c, width, height);
-    return isPos32Bits(size) ? size.get32() : 0;
+    int64_t size = SkBitmap::ComputeSize64(c, width, height);
+    return sk_64_isS32(size) ? sk_64_asS32(size) : 0;
 }
 
-Sk64 SkBitmap::ComputeSafeSize64(Config config,
-                                 uint32_t width,
-                                 uint32_t height,
-                                 size_t rowBytes) {
-    Sk64 safeSize;
-    safeSize.setZero();
+int64_t SkBitmap::ComputeSafeSize64(Config config,
+                                    uint32_t width,
+                                    uint32_t height,
+                                    size_t rowBytes) {
+    int64_t safeSize = 0;
     if (height > 0) {
-        // TODO: Handle the case where the return value from
-        // ComputeRowBytes is more than 31 bits.
-        safeSize.set(SkToS32(ComputeRowBytes(config, width)));
-        Sk64 sizeAllButLastRow;
-        sizeAllButLastRow.setMul(height - 1, SkToS32(rowBytes));
-        safeSize.add(sizeAllButLastRow);
+        int64_t lastRow = sk_64_mul(ComputeBytesPerPixel(config), width);
+        safeSize = sk_64_mul(height - 1, rowBytes) + lastRow;
     }
-    SkASSERT(!safeSize.isNeg());
+    SkASSERT(safeSize >= 0);
     return safeSize;
 }
 
 size_t SkBitmap::ComputeSafeSize(Config config,
                                  uint32_t width,
                                  uint32_t height,
                                  size_t rowBytes) {
-    Sk64 safeSize = ComputeSafeSize64(config, width, height, rowBytes);
-    return (safeSize.is32() ? safeSize.get32() : 0);
+    int64_t safeSize = ComputeSafeSize64(config, width, height, rowBytes);
+    int32_t safeSize32 = (int32_t)safeSize;
+    
+    if (safeSize32 != safeSize) {
+        safeSize32 = 0;
+    }
+    return safeSize32;
 }
 
 void SkBitmap::getBounds(SkRect* bounds) const {
     SkASSERT(bounds);
     bounds->set(0, 0,
                 SkIntToScalar(fWidth), SkIntToScalar(fHeight));
 }
 
 void SkBitmap::getBounds(SkIRect* bounds) const {
     SkASSERT(bounds);
@@ skipping 292 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 size_t SkBitmap::getSafeSize() const {
     // This is intended to be a size_t version of ComputeSafeSize64(), just
     // faster. The computation is meant to be identical.
     return (fHeight ? ((fHeight - 1) * fRowBytes) +
             ComputeRowBytes(this->config(), fWidth): 0);
 }
 
-Sk64 SkBitmap::getSafeSize64() const {
-    return ComputeSafeSize64(this->config(), fWidth, fHeight, fRowBytes);
-}
-
 bool SkBitmap::copyPixelsTo(void* const dst, size_t dstSize,
                             size_t dstRowBytes, bool preserveDstPad) const {
 
     if (0 == dstRowBytes) {
         dstRowBytes = fRowBytes;
     }
 
     if (dstRowBytes < ComputeRowBytes(this->config(), fWidth) ||
         dst == NULL || (getPixels() == NULL && pixelRef() == NULL))
         return false;
@@ skipping 1136 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif