rename ScaledImageCache to ResourceCache

rename ScaledImageCache to ResourceCache

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/011f39aeb2b9715546eb74d9ebb71be7baf95fde

[reed1, 2014-08-28 15:56:56]

reed@google.com changed reviewers:
+ bsalomon@google.com, mtklein@google.com

[reed1, 2014-08-28 15:56:56]

should be just a rename, plus deleting a bit of dead code (from before)

[reed1, 2014-08-28 15:56:59]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-08-28 15:57:41]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/reed@google.com/511283002/1

[commit-bot: I haz the power, 2014-08-28 15:57:42]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from a valid reviewer till 2014-08-28 21:57 UTC

[reed1, 2014-08-28 15:58:07]

The CQ bit was unchecked by reed@google.com

[reed1, 2014-08-28 16:13:01]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-08-28 16:13:51]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/reed@google.com/511283002/20001

[commit-bot: I haz the power, 2014-08-28 16:13:52]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from a valid reviewer till 2014-08-28 22:13 UTC

[mtklein, 2014-08-28 16:30:19]

lgtm

https://codereview.chromium.org/511283002/diff/20001/tests/ScaledImageCache.cpp
File tests/ScaledImageCache.cpp (left):

https://codereview.chromium.org/511283002/diff/20001/tests/ScaledImageCache.c...
tests/ScaledImageCache.cpp:2: * Copyright 2014 Google Inc.
Let's follow up with renaming this file too?

[commit-bot: I haz the power, 2014-08-28 16:59:45]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-28 16:59:46]

Failed to apply patch for src/core/SkBitmapProcState.cpp:
While running git apply --index -p1;
  error: patch failed: src/core/SkBitmapProcState.cpp:201
  error: src/core/SkBitmapProcState.cpp: patch does not apply

Patch:       src/core/SkBitmapProcState.cpp
Index: src/core/SkBitmapProcState.cpp
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index
2583cb5011f3feb872fb503b5fae7b72fef13f07..2ee5e9beb47cd8ed69a67c43b467a39c3e50ee9b
100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -16,6 +16,7 @@
 #include "SkMipMap.h"
 #include "SkPixelRef.h"
 #include "SkImageEncoder.h"
+#include "SkResourceCache.h"
 
 #if !SK_ARM_NEON_IS_NONE
 // These are defined in src/opts/SkBitmapProcState_arm_neon.cpp
@@ -107,31 +108,10 @@ static SkScalar effective_matrix_scale_sqrd(const
SkMatrix& mat) {
     return SkMaxScalar(v1.lengthSqd(), v2.lengthSqd());
 }
 
-class AutoScaledCacheUnlocker {
-public:
-    AutoScaledCacheUnlocker(SkScaledImageCache::ID* idPtr) : fIDPtr(idPtr) {}
-    ~AutoScaledCacheUnlocker() {
-        if (fIDPtr && *fIDPtr) {
-            SkScaledImageCache::Unlock(*fIDPtr);
-            *fIDPtr = NULL;
-        }
-    }
-
-    // forgets the ID, so it won't call Unlock
-    void release() {
-        fIDPtr = NULL;
-    }
-
-private:
-    SkScaledImageCache::ID* fIDPtr;
-};
-#define AutoScaledCacheUnlocker(...)
SK_REQUIRE_LOCAL_VAR(AutoScaledCacheUnlocker)
-
 // Check to see that the size of the bitmap that would be produced by
 // scaling by the given inverted matrix is less than the maximum allowed.
 static inline bool cache_size_okay(const SkBitmap& bm, const SkMatrix& invMat)
{
-    size_t maximumAllocation
-        = SkScaledImageCache::GetSingleAllocationByteLimit();
+    size_t maximumAllocation = SkResourceCache::GetSingleAllocationByteLimit();
     if (0 == maximumAllocation) {
         return true;
     }
@@ -201,7 +181,7 @@ bool SkBitmapProcState::possiblyScaleImage() {
                                         SkBitmapScaler::RESIZE_BEST,
                                         roundedDestWidth,
                                         roundedDestHeight,
-                                        SkScaledImageCache::GetAllocator())) {
+                                        SkResourceCache::GetAllocator())) {
                 // we failed to create fScaledBitmap, so just return and let
                 // the scanline proc handle it.
                 return false;

[reed1, 2014-08-28 20:27:05]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-08-28 20:27:50]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/reed@google.com/511283002/40001

[commit-bot: I haz the power, 2014-08-28 20:35:27]

Committed patchset #3 (id:40001) as 011f39aeb2b9715546eb74d9ebb71be7baf95fde