diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-28 20:16:25 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-28 20:16:25 +0000 |
| commit | 6177e6999d23a4268ffd98dedfb1da00e272a89b (patch) | |
| tree | aeadfad9da388e124819af0f3e51bec543cfaa9a /tools | |
| parent | 26fb61ae464d9dfeabb4824663cdde379ae87829 (diff) | |
Split GrGLContextInfo into GrGLContext & GrGLContextInfo
https://codereview.appspot.com/7436045/
git-svn-id: http://skia.googlecode.com/svn/trunk@7905 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/PdfRenderer.h | 1 | ||||
| -rw-r--r-- | tools/PictureRenderer.cpp | 2 | ||||
| -rw-r--r-- | tools/PictureRenderer.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tools/PdfRenderer.h b/tools/PdfRenderer.h index 3524a9d8f9..d2d66378b6 100644 --- a/tools/PdfRenderer.h +++ b/tools/PdfRenderer.h @@ -22,7 +22,6 @@ class SkBitmap; class SkCanvas; -class SkGLContext; class SkPDFDevice; namespace sk_tools { diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index caab64a98d..ab5df5414e 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -203,7 +203,7 @@ void PictureRenderer::buildBBoxHierarchy() { void PictureRenderer::resetState(bool callFinish) { #if SK_SUPPORT_GPU - SkGLContext* glContext = this->getGLContext(); + SkGLContextHelper* glContext = this->getGLContext(); if (NULL == glContext) { SkASSERT(kBitmap_DeviceType == fDeviceType); return; diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h index 47fc7d7a31..438488a66b 100644 --- a/tools/PictureRenderer.h +++ b/tools/PictureRenderer.h @@ -29,7 +29,7 @@ class SkBitmap; class SkCanvas; -class SkGLContext; +class SkGLContextHelper; class SkThread; namespace sk_tools { @@ -228,7 +228,7 @@ public: } } - SkGLContext* getGLContext() { + SkGLContextHelper* getGLContext() { GrContextFactory::GLContextType glContextType = GrContextFactory::kNull_GLContextType; switch(fDeviceType) { |