diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-30 09:26:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-30 09:26:24 -0700 |
| commit | 6f70d43719d0583d486a000f66e915c10a6b83a2 (patch) | |
| tree | 6f9511faa88ca6d44932e1a247fc10c0f297a3e0 /tools/skiaserve | |
| parent | fe3456cb006110d045b26ff3f8681b893a757b58 (diff) | |
Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module (patchset #13 id:240001 of https://codereview.chromium.org/1815823002/ )
Reason for revert:
red bots
Original issue's description:
> Move SkGLContext and some GrGLInterface implementations to skgputest module
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1815823002
> CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/fe3456cb006110d045b26ff3f8681b893a757b58
TBR=jvanverth@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1845473004
Diffstat (limited to 'tools/skiaserve')
| -rw-r--r-- | tools/skiaserve/Request.cpp | 6 | ||||
| -rw-r--r-- | tools/skiaserve/Request.h | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index d9e1bdaa33..1d946abaa0 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -10,8 +10,6 @@ #include "SkPictureRecorder.h" #include "SkPixelSerializer.h" -using namespace sk_gpu_test; - static int kDefaultWidth = 1920; static int kDefaultHeight = 1080; @@ -65,8 +63,8 @@ SkData* Request::writeCanvasToPng(SkCanvas* canvas) { SkCanvas* Request::getCanvas() { #if SK_SUPPORT_GPU GrContextFactory* factory = fContextFactory; - GLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType, - GrContextFactory::kNone_GLContextOptions).fGLContext; + SkGLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType, + GrContextFactory::kNone_GLContextOptions).fGLContext; gl->makeCurrent(); #endif SkASSERT(fDebugCanvas); diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h index d19c2ba801..e3bc373841 100644 --- a/tools/skiaserve/Request.h +++ b/tools/skiaserve/Request.h @@ -19,9 +19,7 @@ #include "UrlDataManager.h" -namespace sk_gpu_test { class GrContextFactory; -} struct MHD_Connection; struct MHD_PostProcessor; @@ -71,7 +69,7 @@ private: GrContext* getContext(); sk_sp<SkPicture> fPicture; - sk_gpu_test::GrContextFactory* fContextFactory; + GrContextFactory* fContextFactory; SkAutoTUnref<SkSurface> fSurface; bool fGPUEnabled; }; |