Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(952)

Unified Diff: src/gpu/gl/GrGLGpu.h

Issue 1215593002: Revert of Revert of Return GrGLContext from GrTestTarget (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLContext.h ('k') | tests/ResourceCacheTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLGpu.h
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
index 98d0ffcd33fda92912980e33ec0f7221b9ae6df5..4872db7309d656ccea5bb92b5767a99be2469681 100644
--- a/src/gpu/gl/GrGLGpu.h
+++ b/src/gpu/gl/GrGLGpu.h
@@ -109,8 +109,8 @@
const GrPipeline&,
const GrBatchTracker&) const override;
- virtual const GrGLInterface* glInterfaceForTesting() const {
- return this->glInterface();
+ const GrGLContext* glContextForTesting() const override {
+ return &this->glContext();
}
private:
@@ -300,7 +300,7 @@
void unbindTextureFromFBO(GrGLenum fboTarget);
- SkAutoTDelete<GrGLContext> fGLContext;
+ SkAutoTUnref<GrGLContext> fGLContext;
void createCopyProgram();
« no previous file with comments | « src/gpu/gl/GrGLContext.h ('k') | tests/ResourceCacheTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698