diff options
| author |  reed <reed@chromium.org> | 2015-06-25 21:29:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-25 21:29:25 -0700 |
| commit | f9ad558943ee14bdff824ebfb33988bece8ed3db (patch) | |
| tree | 869701a9a9798dc74ccc51e2a14a131d33be7c9e /src/gpu/GrGpu.h | |
| parent | e1b8958877a512bf83cbc2c72bb31e7d71b06f43 (diff) | |
Revert of Revert of Return GrGLContext from GrTestTarget (patchset #1 id:1 of https://codereview.chromium.org/1211123004/)
Reason for revert:
un-referting, did not help DEPS roll
Original issue's description:
> Revert of Return GrGLContext from GrTestTarget (patchset #3 id:40001 of https://codereview.chromium.org/1207393002/)
>
> Reason for revert:
> speculative revert to unblock DEPS roll (layout-tests)
>
> Original issue's description:
> > Return GrGLContext from GrTestTarget
> >
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/b6d93ea428ca5d13641c35faca7d0380980a3a17
>
> TBR=bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/1852ec2b46a2a0efbb3550ff4d8b640f56a810e9
TBR=bsalomon@google.com,joshualitt@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1215593002
Diffstat (limited to 'src/gpu/GrGpu.h')
| -rw-r--r-- | src/gpu/GrGpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index 3bb84a4485..8d449b7606 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -17,7 +17,7 @@ class GrBatchTracker; class GrContext; -struct GrGLInterface; +class GrGLContext; class GrIndexBuffer; class GrNonInstancedVertices; class GrPath; @@ -366,7 +366,7 @@ public: bool attachStencilAttachmentToRenderTarget(GrRenderTarget* target); // This is only to be used in tests. - virtual const GrGLInterface* glInterfaceForTesting() const { return NULL; } + virtual const GrGLContext* glContextForTesting() const { return NULL; } protected: // Functions used to map clip-respecting stencil tests into normal |