From 9b440260d54795213a13d6394b5c9546e0f69fae Mon Sep 17 00:00:00 2001 From: stephana Date: Mon, 2 Feb 2015 14:52:11 -0800 Subject: Revert of make getContentKey() available in GrGpuResource public interface (patchset #2 id:20001 of https://codereview.chromium.org/886313005/) Reason for revert: This causes in one case the linker and in the other the compiler to segfault. On Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/Release Original issue's description: > make getContentKey() available in GrGpuResource public interface > > TBR=robertphillips@google.com > > Committed: https://skia.googlesource.com/skia/+/85ed2db092e75db41b711b9116a8d5b465fc2b0c TBR=robertphillips@google.com,bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/864343005 --- include/gpu/GrGpuResource.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/gpu') diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h index 7896ab3e84..bdf6257d4d 100644 --- a/include/gpu/GrGpuResource.h +++ b/include/gpu/GrGpuResource.h @@ -188,10 +188,6 @@ public: */ uint32_t getUniqueID() const { return fUniqueID; } - /** Returns the current content key for the resource. It will be invalid if the resource has not - been cached by its contents. */ - const GrContentKey& getContentKey() const { return fContentKey; } - /** * Attach a custom data object to this resource. The data will remain attached * for the lifetime of this resource (until it is abandoned or released). -- cgit v1.2.3