Revert of Add mock context and use in ResourceCacheTest. (patchset #4 id:60001 of https://codereview.chromium.org/702083003/)
Reason for revert:
Breaking tests
Original issue's description:
> Add mock context and use in ResourceCacheTest.
>
> BUG=skia:2889
>
> Committed: https://skia.googlesource.com/skia/+/820dd6c335411aad889c1d7e8a857642ecd87e30
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2889
Review URL: https://codereview.chromium.org/704563004
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index a456a79..5891840 100755
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -121,11 +121,7 @@
if (NULL == fGpu) {
return false;
}
- this->initCommon();
- return true;
-}
-void GrContext::initCommon() {
fDrawState = SkNEW(GrDrawState);
fGpu->setDrawState(fDrawState);
@@ -145,6 +141,8 @@
fDidTestPMConversions = false;
this->setupDrawBuffer();
+
+ return true;
}
GrContext::~GrContext() {
@@ -158,14 +156,14 @@
(*fCleanUpData[i].fFunc)(this, fCleanUpData[i].fInfo);
}
- SkDELETE(fResourceCache2);
+ delete fResourceCache2;
fResourceCache2 = NULL;
- SkDELETE(fResourceCache);
+ delete fResourceCache;
fResourceCache = NULL;
- SkDELETE(fFontCache);
- SkDELETE(fDrawBuffer);
- SkDELETE(fDrawBufferVBAllocPool);
- SkDELETE(fDrawBufferIBAllocPool);
+ delete fFontCache;
+ delete fDrawBuffer;
+ delete fDrawBufferVBAllocPool;
+ delete fDrawBufferIBAllocPool;
fAARectRenderer->unref();
fOvalRenderer->unref();
diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp
index efb37ca..6013b16 100644
--- a/src/gpu/GrTest.cpp
+++ b/src/gpu/GrTest.cpp
@@ -40,138 +40,3 @@
void GrContext::purgeAllUnlockedResources() {
fResourceCache->purgeAllUnlocked();
}
-
-///////////////////////////////////////////////////////////////////////////////
-// Code for the mock context. It's built on a mock GrGpu class that does nothing.
-////
-
-#include "GrBufferAllocPool.h"
-#include "GrInOrderDrawBuffer.h"
-#include "GrGpu.h"
-
-class MockGpu : public GrGpu {
-public:
- MockGpu(GrContext* context) : INHERITED(context) { fCaps.reset(SkNEW(GrDrawTargetCaps)); }
- virtual ~MockGpu() { }
- virtual bool canWriteTexturePixels(const GrTexture*,
- GrPixelConfig srcConfig) const SK_OVERRIDE {
- return true;
- }
-
- virtual bool readPixelsWillPayForYFlip(GrRenderTarget* renderTarget,
- int left, int top,
- int width, int height,
- GrPixelConfig config,
- size_t rowBytes) const SK_OVERRIDE { return false; }
- virtual void buildProgramDesc(const GrOptDrawState&,
- const GrProgramDesc::DescInfo&,
- GrGpu::DrawType,
- const GrDeviceCoordTexture* dstCopy,
- GrProgramDesc* desc) SK_OVERRIDE { }
-
- virtual void discard(GrRenderTarget*) SK_OVERRIDE { }
-
-private:
- virtual void onResetContext(uint32_t resetBits) { };
- virtual GrTexture* onCreateTexture(const GrSurfaceDesc& desc,
- const void* srcData,
- size_t rowBytes) SK_OVERRIDE {
- return NULL;
- }
-
- virtual GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc,
- const void* srcData) SK_OVERRIDE {
- return NULL;
- }
-
- virtual GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&) SK_OVERRIDE {
- return NULL;
- }
-
- virtual GrRenderTarget* onWrapBackendRenderTarget(
- const GrBackendRenderTargetDesc&) SK_OVERRIDE {
- return NULL;
- }
-
- virtual GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) SK_OVERRIDE {
- return NULL;
- }
-
- virtual GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) SK_OVERRIDE {
- return NULL;
- }
-
- virtual void onGpuClear(GrRenderTarget*, const SkIRect* rect, GrColor color,
- bool canIgnoreRect) SK_OVERRIDE { }
-
- virtual void onClearStencilClip(GrRenderTarget*,
- const SkIRect& rect,
- bool insideClip) SK_OVERRIDE { }
-
- virtual void onGpuDraw(const DrawInfo&) SK_OVERRIDE { }
- virtual bool onReadPixels(GrRenderTarget* target,
- int left, int top, int width, int height,
- GrPixelConfig,
- void* buffer,
- size_t rowBytes) SK_OVERRIDE {
- return false;
- }
-
- virtual bool onWriteTexturePixels(GrTexture* texture,
- int left, int top, int width, int height,
- GrPixelConfig config, const void* buffer,
- size_t rowBytes) SK_OVERRIDE {
- return false;
- }
-
- virtual void onResolveRenderTarget(GrRenderTarget* target) SK_OVERRIDE {
- return;
- }
-
- virtual bool createStencilBufferForRenderTarget(GrRenderTarget*, int width,
- int height) SK_OVERRIDE {
- return false;
- }
-
- virtual bool attachStencilBufferToRenderTarget(GrStencilBuffer*, GrRenderTarget*) SK_OVERRIDE {
- return false;
- }
-
- virtual bool flushGraphicsState(DrawType,
- const GrClipMaskManager::ScissorState&,
- const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE {
- return false;
- }
-
- virtual void clearStencil(GrRenderTarget* target) SK_OVERRIDE { }
-
- virtual void didAddGpuTraceMarker() SK_OVERRIDE { }
- virtual void didRemoveGpuTraceMarker() SK_OVERRIDE { }
-
- typedef GrGpu INHERITED;
-};
-
-GrContext* GrContext::CreateMockContext() {
- GrContext* context = SkNEW_ARGS(GrContext, (Options()));
-
- context->initMockContext();
- return context;
-}
-
-void GrContext::initMockContext() {
- SkASSERT(NULL == fGpu);
- fGpu = SkNEW_ARGS(MockGpu, (this));
- SkASSERT(fGpu);
- this->initCommon();
-
- // We delete these because we want to test the cache starting with zero resources. Also, none of
- // these objects are required for any of tests that use this context. TODO: make stop allocating
- // resources in the buffer pools.
- SkDELETE(fDrawBuffer);
- SkDELETE(fDrawBufferVBAllocPool);
- SkDELETE(fDrawBufferIBAllocPool);
-
- fDrawBuffer = NULL;
- fDrawBufferVBAllocPool = NULL;
- fDrawBufferIBAllocPool = NULL;
-}