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

Unified Diff: dm/DMGpuSupport.h

Issue 1815823002: Move SkGLContext and some GrGLInterface implementations to skgputest module (Closed) Base URL: https://chromium.googlesource.com/skia.git@debugobject
Patch Set: fix windows and android? Created 4 years, 9 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 | « dm/DM.cpp ('k') | dm/DMSrcSink.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DMGpuSupport.h
diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h
index 73adeb03027dc46e5fe964a3e7689569ab4f723d..c713244e9dd61724bea255614eeb4514f978fb30 100644
--- a/dm/DMGpuSupport.h
+++ b/dm/DMGpuSupport.h
@@ -28,12 +28,13 @@ namespace DM {
static const bool kGPUDisabled = false;
-static inline sk_sp<SkSurface> NewGpuSurface(GrContextFactory* grFactory,
- GrContextFactory::GLContextType type,
- GrContextFactory::GLContextOptions options,
- SkImageInfo info,
- int samples,
- bool useDIText) {
+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) {
uint32_t flags = useDIText ? SkSurfaceProps::kUseDeviceIndependentFonts_Flag : 0;
SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
return SkSurface::MakeRenderTarget(grFactory->get(type, options), SkBudgeted::kNo,
@@ -59,6 +60,7 @@ public:
void dumpGpuStats(SkString*) const {}
};
+namespace sk_gpu_test {
class GrContextFactory {
public:
GrContextFactory() {};
@@ -83,14 +85,15 @@ public:
void abandonContexts() {}
};
+} // namespace sk_gpu_test
namespace DM {
static const bool kGPUDisabled = true;
-static inline SkSurface* NewGpuSurface(GrContextFactory*,
- GrContextFactory::GLContextType,
- GrContextFactory::GLContextOptions,
+static inline SkSurface* NewGpuSurface(sk_gpu_test::GrContextFactory*,
+ sk_gpu_test::GrContextFactory::GLContextType,
+ sk_gpu_test::GrContextFactory::GLContextOptions,
SkImageInfo,
int,
bool) {
« no previous file with comments | « dm/DM.cpp ('k') | dm/DMSrcSink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698