SkMipMap::ComputeLevelSize to return SkISize

src/core/SkMipMap.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMipMap.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 355 matching lines @@
             return nullptr;
     }
 
     if (src.width() <= 1 && src.height() <= 1) {
         return nullptr;
     }
     // whip through our loop to compute the exact size needed
     size_t  size = 0;
     int countLevels = ComputeLevelCount(src.width(), src.height());
     for (int currentMipLevel = countLevels; currentMipLevel > 0; currentMipLevel--) {
-        SkSize mipSize = ComputeLevelSize(src.width(), src.height(), currentMipLevel);
+        SkISize mipSize = ComputeLevelSize(src.width(), src.height(), currentMipLevel);
         size += SkColorTypeMinRowBytes(ct, mipSize.fWidth) * mipSize.fHeight;
     }
 
     size_t storageSize = SkMipMap::AllocLevelsSize(countLevels, size);
     if (0 == storageSize) {
         return nullptr;
     }
 
     SkMipMap* mipmap;
     if (fact) {
@@ skipping 102 matching lines @@
     // For example, it contains levels 1-x instead of 0-x.
     // This is because the image used to create SkMipMap is the base level.
     // So subtract 1 from the mip level count.
     if (mipLevelCount > 0) {
         --mipLevelCount;
     }
 
     return mipLevelCount;
 }
 
-SkSize SkMipMap::ComputeLevelSize(int baseWidth, int baseHeight, int level) {
+SkISize SkMipMap::ComputeLevelSize(int baseWidth, int baseHeight, int level) {
     if (baseWidth < 1 || baseHeight < 1) {
-        return SkSize::Make(0, 0);
+        return SkISize::Make(0, 0);
     }
 
     int maxLevelCount = ComputeLevelCount(baseWidth, baseHeight);
     if (level > maxLevelCount || level < 0) {
-        return SkSize::Make(0, 0);
+        return SkISize::Make(0, 0);
     }
     if (level == 0) {
-        return SkSize::Make(baseWidth, baseHeight);
+        return SkISize::Make(baseWidth, baseHeight);
     }
 
     // OpenGL's spec requires that each mipmap level have height/width equal to
     // max(1, floor(original_height / 2^i)
     // (or original_width) where i is the mipmap level.
 
     int width = SkTMax(1, baseWidth >> level);
     int height = SkTMax(1, baseHeight >> level);
 
-    return SkSize::Make(width, height);
+    return SkISize::Make(width, height);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkMipMap::extractLevel(const SkSize& scaleSize, Level* levelPtr) const {
     if (nullptr == fLevels) {
         return false;
     }
 
     SkASSERT(scaleSize.width() >= 0 && scaleSize.height() >= 0);
@@ skipping 62 matching lines @@
         return false;
     }
     if (index > fCount - 1) {
         return false;
     }
     if (levelPtr) {
         *levelPtr = fLevels[index];
     }
     return true;
 }