From 71cb0c241e439b6ed746b90294d0b6916644a644 Mon Sep 17 00:00:00 2001
From: bsalomon <bsalomon@google.com>
Date: Fri, 14 Nov 2014 12:10:14 -0800
Subject: Replace GrResourceCache with GrResourceCache2.

BUG=skia:2889

Committed: https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6

Committed: https://skia.googlesource.com/skia/+/407aa584d183c1bf314f5defd1cf0202e8a96c89

Review URL: https://codereview.chromium.org/716143004
---
 gyp/gpu.gyp  | 10 ----------
 gyp/gpu.gypi |  2 --
 2 files changed, 12 deletions(-)

(limited to 'gyp')

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index d40afe1a95..631945607d 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -63,16 +63,6 @@
           ],
         },
       }],
-      [ 'skia_resource_cache_mb_limit != 0', {
-        'defines': [
-          'GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT=<(skia_resource_cache_mb_limit)',
-        ],
-      }],
-      [ 'skia_resource_cache_count_limit != 0', {
-        'defines': [
-          'GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT=<(skia_resource_cache_count_limit)',
-        ],
-      }],
     ],
     'direct_dependent_settings': {
       'conditions': [
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 8eca40c3d3..5095c44c5c 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -136,8 +136,6 @@
       '<(skia_src_path)/gpu/GrRenderTarget.cpp',
       '<(skia_src_path)/gpu/GrReducedClip.cpp',
       '<(skia_src_path)/gpu/GrReducedClip.h',
-      '<(skia_src_path)/gpu/GrResourceCache.cpp',
-      '<(skia_src_path)/gpu/GrResourceCache.h',
       '<(skia_src_path)/gpu/GrResourceCache2.cpp',
       '<(skia_src_path)/gpu/GrResourceCache2.h',
       '<(skia_src_path)/gpu/GrStencil.cpp',
-- 
cgit v1.2.3