commit 334355742137cc238887d4f85856e6c4d9ec8aa8
author bsalomon <bsalomon@google.com> Wed Nov 05 14:47:41 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Nov 05 14:47:42 2014 -0800
tree f9534c36e04abd374ff41973eedaee8e2dbe21ee
parent d5cd4ee5b81b51e43be7ed13f3c0f0f6c1b3fe14

Add mock context and use in ResourceCacheTest.

BUG=skia:2889

Committed: https://skia.googlesource.com/skia/+/820dd6c335411aad889c1d7e8a857642ecd87e30

Review URL: https://codereview.chromium.org/702083003

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 5891840..a456a79 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -121,7 +121,11 @@
     if (NULL == fGpu) {
         return false;
     }
+    this->initCommon();
+    return true;
+}
 
+void GrContext::initCommon() {
     fDrawState = SkNEW(GrDrawState);
     fGpu->setDrawState(fDrawState);
 
@@ -141,8 +145,6 @@
     fDidTestPMConversions = false;
 
     this->setupDrawBuffer();
-
-    return true;
 }
 
 GrContext::~GrContext() {
@@ -156,14 +158,14 @@
         (*fCleanUpData[i].fFunc)(this, fCleanUpData[i].fInfo);
     }
 
-    delete fResourceCache2;
+    SkDELETE(fResourceCache2);
     fResourceCache2 = NULL;
-    delete fResourceCache;
+    SkDELETE(fResourceCache);
     fResourceCache = NULL;
-    delete fFontCache;
-    delete fDrawBuffer;
-    delete fDrawBufferVBAllocPool;
-    delete fDrawBufferIBAllocPool;
+    SkDELETE(fFontCache);
+    SkDELETE(fDrawBuffer);
+    SkDELETE(fDrawBufferVBAllocPool);
+    SkDELETE(fDrawBufferIBAllocPool);
 
     fAARectRenderer->unref();
     fOvalRenderer->unref();