commit d3a2af75a959823a6a6d143409a64414ac64896a
author Mike Reed <reed@google.com> Mon Nov 07 14:30:00 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 08 02:59:49 2016 +0000
tree bd2e393bdb00b16ddbee849a80f8dfb3b3648f0d
parent 144caf55ffc692bcda77703a73bb9a894f7d024f

minor simplification: use SkBitmapCacheDesc

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4523

Change-Id: I2bbcbc8a9839e74195ff147cab2cd1e6ab34b4c5
Reviewed-on: https://skia-review.googlesource.com/4523
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkBitmapCache.cpp

diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp
index 153a247..e6a664b 100644
--- a/src/core/SkBitmapCache.cpp
+++ b/src/core/SkBitmapCache.cpp
@@ -54,12 +54,7 @@
 }
 
 SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkBitmap& bm, int width, int height) {
-    SkBitmapCacheDesc desc;
-    desc.fImageID = bm.getGenerationID();
-    desc.fWidth = width;
-    desc.fHeight = height;
-    desc.fBounds = get_bounds_from_bitmap(bm);
-    return desc;
+    return { bm.getGenerationID(), width, height, get_bounds_from_bitmap(bm) };
 }
 
 SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkBitmap& bm) {
@@ -67,12 +62,7 @@
 }
 
 SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkImage* image, int width, int height) {
-    SkBitmapCacheDesc desc;
-    desc.fImageID = image->uniqueID();
-    desc.fWidth = width;
-    desc.fHeight = height;
-    desc.fBounds = get_bounds_from_image(image);
-    return desc;
+    return { image->uniqueID(), width, height, get_bounds_from_image(image) };
 }
 
 SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkImage* image) {
@@ -85,39 +75,27 @@
 struct BitmapKey : public SkResourceCache::Key {
 public:
     BitmapKey(uint32_t genID, int width, int height, const SkIRect& bounds)
-        : fGenID(genID)
-        , fWidth(width)
-        , fHeight(height)
-        , fBounds(bounds)
+        : fDesc({ genID, width, height, bounds })
     {
-        this->init(&gBitmapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(fGenID),
-                   sizeof(fGenID) + sizeof(fWidth) + sizeof(fHeight) + sizeof(fBounds));
+        this->init(&gBitmapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(fDesc.fImageID),
+                   sizeof(fDesc));
     }
 
-    BitmapKey(const SkBitmapCacheDesc& desc)
-        : fGenID(desc.fImageID)
-        , fWidth(desc.fWidth)
-        , fHeight(desc.fHeight)
-        , fBounds(desc.fBounds)
-    {
-        this->init(&gBitmapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(fGenID),
-                   sizeof(fGenID) + sizeof(fWidth) + sizeof(fHeight) + sizeof(fBounds));
+    BitmapKey(const SkBitmapCacheDesc& desc) : fDesc(desc) {
+        this->init(&gBitmapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(fDesc.fImageID),
+                   sizeof(fDesc));
     }
 
     void dump() const {
-        SkDebugf("-- add [%d %d] %d [%d %d %d %d]\n", fWidth, fHeight, fGenID,
-                 fBounds.x(), fBounds.y(), fBounds.width(), fBounds.height());
+        SkDebugf("-- add [%d %d] %d [%d %d %d %d]\n", fDesc.fWidth, fDesc.fHeight, fDesc.fImageID,
+            fDesc.fBounds.x(), fDesc.fBounds.y(), fDesc.fBounds.width(), fDesc.fBounds.height());
     }
 
-    const uint32_t  fGenID;
-    const int       fWidth;
-    const int       fHeight;
-    const SkIRect   fBounds;
+    const SkBitmapCacheDesc fDesc;
 };
 
 struct BitmapRec : public SkResourceCache::Rec {
-    BitmapRec(uint32_t genID, int width, int height, const SkIRect& bounds,
-              const SkBitmap& result)
+    BitmapRec(uint32_t genID, int width, int height, const SkIRect& bounds, const SkBitmap& result)
         : fKey(genID, width, height, bounds)
         , fBitmap(result)
     {