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
Review URL: https://codereview.chromium.org/1815823002
diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h
index 73adeb0..c713244 100644
--- a/dm/DMGpuSupport.h
+++ b/dm/DMGpuSupport.h
@@ -28,12 +28,13 @@
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 @@
void dumpGpuStats(SkString*) const {}
};
+namespace sk_gpu_test {
class GrContextFactory {
public:
GrContextFactory() {};
@@ -83,14 +85,15 @@
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) {