From b06e5a2f558133b865cb0c3cc0b36e9bd2e594e2 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 30 Sep 2014 06:58:20 -0700 Subject: Revert of Make "priv" classes for GrTexure and GrSurface. (patchset #9 id:260001 of https://codereview.chromium.org/596053002/) Reason for revert: Breaking the Chrome builds with: lib/libcc.so: error: undefined reference to 'GrAutoScratchTexture::detach()' (http://108.170.220.120:10117/builders/Canary-Chrome-Ubuntu13.10-Ninja-x86_64-DRT/builds/2990/steps/Retry_BuildContentShell_1/logs/stdio) Original issue's description: > Make "priv" classes for GrTexure and GrSurface. R=egdaniel@google.com, joshualitt@google.com, bsalomon@google.com TBR=bsalomon@google.com, egdaniel@google.com, joshualitt@google.com NOTREECHECKS=true NOTRY=true Author: robertphillips@google.com Review URL: https://codereview.chromium.org/618733002 --- bench/GrResourceCacheBench.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bench/GrResourceCacheBench.cpp') diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index 234a62624c..d86ccf4b0b 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -14,7 +14,6 @@ #include "GrResourceCache.h" #include "GrStencilBuffer.h" #include "GrTexture.h" -#include "GrTexturePriv.h" #include "SkCanvas.h" enum { @@ -63,7 +62,7 @@ public: } static GrResourceKey ComputeKey(const GrTextureDesc& desc) { - return GrTexturePriv::ComputeScratchKey(desc); + return GrTextureImpl::ComputeScratchKey(desc); } int fID; -- cgit v1.2.3