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 /dm/DMGpuSupport.h | |
| 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 'dm/DMGpuSupport.h')
| -rw-r--r-- | dm/DMGpuSupport.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h index c713244e9d..73adeb0302 100644 --- a/dm/DMGpuSupport.h +++ b/dm/DMGpuSupport.h @@ -28,13 +28,12 @@ namespace DM { static const bool kGPUDisabled = false; -static inline sk_sp<SkSurface> NewGpuSurface( - sk_gpu_test::GrContextFactory* grFactory, - sk_gpu_test::GrContextFactory::GLContextType type, - sk_gpu_test::GrContextFactory::GLContextOptions options, - SkImageInfo info, - int samples, - bool useDIText) { +static inline sk_sp<SkSurface> NewGpuSurface(GrContextFactory* grFactory, + GrContextFactory::GLContextType type, + GrContextFactory::GLContextOptions options, + SkImageInfo info, + int samples, + bool useDIText) { uint32_t flags = useDIText ? SkSurfaceProps::kUseDeviceIndependentFonts_Flag : 0; SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType); return SkSurface::MakeRenderTarget(grFactory->get(type, options), SkBudgeted::kNo, @@ -60,7 +59,6 @@ public: void dumpGpuStats(SkString*) const {} }; -namespace sk_gpu_test { class GrContextFactory { public: GrContextFactory() {}; @@ -85,15 +83,14 @@ public: void abandonContexts() {} }; -} // namespace sk_gpu_test namespace DM { static const bool kGPUDisabled = true; -static inline SkSurface* NewGpuSurface(sk_gpu_test::GrContextFactory*, - sk_gpu_test::GrContextFactory::GLContextType, - sk_gpu_test::GrContextFactory::GLContextOptions, +static inline SkSurface* NewGpuSurface(GrContextFactory*, + GrContextFactory::GLContextType, + GrContextFactory::GLContextOptions, SkImageInfo, int, bool) { |