Some cleanup in GrTextureProvider and GrResourceProvider

src/gpu/GrAARectRenderer.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAARectRenderer.h"
 #include "GrBatch.h"
 #include "GrBatchTarget.h"
@@ skipping 144 matching lines @@
         GR_DEFINE_STATIC_UNIQUE_KEY(gAAFillRectIndexBufferKey);
 
         static const uint16_t gFillAARectIdx[] = {
             0, 1, 5, 5, 4, 0,
             1, 2, 6, 6, 5, 1,
             2, 3, 7, 7, 6, 2,
             3, 0, 4, 4, 7, 3,
             4, 5, 6, 6, 7, 4,
         };
         GR_STATIC_ASSERT(SK_ARRAY_COUNT(gFillAARectIdx) == kIndicesPerAAFillRect);
-        return resourceProvider->refOrCreateInstancedIndexBuffer(gFillAARectIdx,
+        return resourceProvider->findOrCreateInstancedIndexBuffer(gFillAARectIdx,
             kIndicesPerAAFillRect, kNumAAFillRectsInIndexBuffer, kVertsPerAAFillRect,
             gAAFillRectIndexBufferKey);
     }
 
     GrColor color() const { return fBatch.fColor; }
     bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
     bool canTweakAlphaForCoverage() const { return fBatch.fCanTweakAlphaForCoverage; }
     bool colorIgnored() const { return fBatch.fColorIgnored; }
     const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
     bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
@@ skipping 360 matching lines @@
                 2 + 4, 3 + 4, 7 + 4, 7 + 4, 6 + 4, 2 + 4,
                 3 + 4, 0 + 4, 4 + 4, 4 + 4, 7 + 4, 3 + 4,
 
                 0 + 8, 1 + 8, 5 + 8, 5 + 8, 4 + 8, 0 + 8,
                 1 + 8, 2 + 8, 6 + 8, 6 + 8, 5 + 8, 1 + 8,
                 2 + 8, 3 + 8, 7 + 8, 7 + 8, 6 + 8, 2 + 8,
                 3 + 8, 0 + 8, 4 + 8, 4 + 8, 7 + 8, 3 + 8,
             };
             GR_STATIC_ASSERT(SK_ARRAY_COUNT(gMiterIndices) == kMiterIndexCnt);
             GR_DEFINE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
-            return resourceProvider->refOrCreateInstancedIndexBuffer(gMiterIndices,
+            return resourceProvider->findOrCreateInstancedIndexBuffer(gMiterIndices,
                 kMiterIndexCnt, kNumMiterRectsInIndexBuffer, kMiterVertexCnt,
                 gMiterIndexBufferKey);
         } else {
             /**
              * As in miter-stroke, index = a + b, and a is the current index, b is the shift
              * from the first index. The index layout:
              * outer AA line: 0~3, 4~7
              * outer edge:    8~11, 12~15
              * inner edge:    16~19
              * inner AA line: 20~23
@@ skipping 42 matching lines @@
 
                 // Draw the inner AA, from inner edge to inner AA line, shift is 16.
                 0 + 16, 1 + 16, 5 + 16, 5 + 16, 4 + 16, 0 + 16,
                 1 + 16, 2 + 16, 6 + 16, 6 + 16, 5 + 16, 1 + 16,
                 2 + 16, 3 + 16, 7 + 16, 7 + 16, 6 + 16, 2 + 16,
                 3 + 16, 0 + 16, 4 + 16, 4 + 16, 7 + 16, 3 + 16,
             };
             GR_STATIC_ASSERT(SK_ARRAY_COUNT(gBevelIndices) == kBevelIndexCnt);
 
             GR_DEFINE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
-            return resourceProvider->refOrCreateInstancedIndexBuffer(gBevelIndices,
+            return resourceProvider->findOrCreateInstancedIndexBuffer(gBevelIndices,
                 kBevelIndexCnt, kNumBevelRectsInIndexBuffer, kBevelVertexCnt,
                 gBevelIndexBufferKey);
         }
     }
 
     GrColor color() const { return fBatch.fColor; }
     bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
     bool canTweakAlphaForCoverage() const { return fBatch.fCanTweakAlphaForCoverage; }
     bool colorIgnored() const { return fBatch.fColorIgnored; }
     const SkMatrix& viewMatrix() const { return fBatch.fViewMatrix; }
@@ skipping 229 matching lines @@
     geo.fColor = GrRandomColor(random);
     geo.fDevOutside = outside;
     geo.fDevOutsideAssist = outsideAssist;
     geo.fDevInside = inside;
     geo.fMiterStroke = miterStroke;
 
     return AAStrokeRectBatch::Create(geo, GrTest::TestMatrix(random));
 }
 
 #endif