commit 032aaae5be51e92ec9677d6c511241b19a7cb70d
author Brian Salomon <bsalomon@google.com> Fri Mar 23 16:10:36 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 23 21:12:50 2018 +0000
tree 8fe817c2a16ff23bcb18dfda5a70cec1cc9524de
parent a6a3df7d64dc81082619ab103450fc6d0af7c644

Remove legacy GrContext factories function and supporting code/types.

Change-Id: I437a4a0a58bf70ea1b8b0659b099a2af2bfa64fe
Reviewed-on: https://skia-review.googlesource.com/116197
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

tools/gpu/TestContext.h

diff --git a/tools/gpu/TestContext.h b/tools/gpu/TestContext.h
index 5b512db..2949cc7 100644
--- a/tools/gpu/TestContext.h
+++ b/tools/gpu/TestContext.h
@@ -59,7 +59,6 @@
     SkScopeExit SK_WARN_UNUSED_RESULT makeCurrentAndAutoRestore() const;
 
     virtual GrBackend backend() = 0;
-    virtual GrBackendContext backendContext() = 0;
 
     virtual sk_sp<GrContext> makeGrContext(const GrContextOptions&);
 

tools/gpu/gl/GLTestContext.h

diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h
index cea630a..f5a0593 100644
--- a/tools/gpu/gl/GLTestContext.h
+++ b/tools/gpu/gl/GLTestContext.h
@@ -21,9 +21,6 @@
     ~GLTestContext() override;
 
     virtual GrBackend backend() override { return kOpenGL_GrBackend; }
-    virtual GrBackendContext backendContext() override {
-        return reinterpret_cast<GrBackendContext>(fGL.get());
-    }
 
     bool isValid() const { return SkToBool(this->gl()); }
 

tools/gpu/mock/MockTestContext.cpp

diff --git a/tools/gpu/mock/MockTestContext.cpp b/tools/gpu/mock/MockTestContext.cpp
index 5cc5529..6075bc8 100644
--- a/tools/gpu/mock/MockTestContext.cpp
+++ b/tools/gpu/mock/MockTestContext.cpp
@@ -20,9 +20,7 @@
     ~MockTestContext() override {}
 
     virtual GrBackend backend() override { return kMock_GrBackend; }
-    virtual GrBackendContext backendContext() override {
-        return reinterpret_cast<GrBackendContext>(nullptr);
-    }
+
     void testAbandon() override {}
     void submit() override {}
     void finish() override {}

tools/gpu/mtl/MtlTestContext.mm

diff --git a/tools/gpu/mtl/MtlTestContext.mm b/tools/gpu/mtl/MtlTestContext.mm
index 38755b2..cdc0f8f 100644
--- a/tools/gpu/mtl/MtlTestContext.mm
+++ b/tools/gpu/mtl/MtlTestContext.mm
@@ -122,8 +122,6 @@
 
     GrBackend backend() override { return kMetal_GrBackend; }
 
-    GrBackendContext backendContext() override { return 0; }
-
     void testAbandon() override {}
 
     // There is really nothing to here since we don't own any unqueued command buffers here.

tools/gpu/vk/VkTestContext.h

diff --git a/tools/gpu/vk/VkTestContext.h b/tools/gpu/vk/VkTestContext.h
index 5090f55..9fd4170 100644
--- a/tools/gpu/vk/VkTestContext.h
+++ b/tools/gpu/vk/VkTestContext.h
@@ -18,9 +18,6 @@
 class VkTestContext : public TestContext {
 public:
     virtual GrBackend backend() override { return kVulkan_GrBackend; }
-    virtual GrBackendContext backendContext() override {
-        return reinterpret_cast<GrBackendContext>(fVk.get());
-    }
 
     sk_sp<const GrVkBackendContext> getVkBackendContext() {
         return fVk;