From a90ed4e83897b45d6331ee4c54e1edd4054de9a8 Mon Sep 17 00:00:00 2001
From: kkinnunen <kkinnunen@nvidia.com>
Date: Wed, 8 Oct 2014 04:14:24 -0700
Subject: Make the Sk GL context class an abstract base class

Make the Sk GL context class, SkGLNativeContext, an abstract base class. Before,
it depended on ifdefs to implement the platform dependent polymorphism.  Move
the logic to subclasses of the various platform implementations.

This a step to enable Skia embedders to compile dm and bench_pictures. The
concrete goal is to support running these test apps with Chromium command buffer.

With this change, Chromium can implement its own version of SkGLNativeContext
that uses command buffer, and host the implementation in its own repository.

Implements the above by renaming the SkGLContextHelper to SkGLContext and
removing the unneeded SkGLNativeContext. Also removes
SkGLNativeContext::AutoRestoreContext functionality, it appeared to be unused:
no use in Skia code, and no tests.

BUG=skia:2992

Review URL: https://codereview.chromium.org/630843002
---
 tools/timer/GpuTimer.cpp | 4 ++--
 tools/timer/GpuTimer.h   | 6 +++---
 tools/timer/Timer.cpp    | 2 +-
 tools/timer/Timer.h      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tools/timer')

diff --git a/tools/timer/GpuTimer.cpp b/tools/timer/GpuTimer.cpp
index aac10a3b07..0fdd999922 100644
--- a/tools/timer/GpuTimer.cpp
+++ b/tools/timer/GpuTimer.cpp
@@ -6,10 +6,10 @@
  * found in the LICENSE file.
  */
 #include "GpuTimer.h"
-#include "gl/SkGLContextHelper.h"
+#include "gl/SkGLContext.h"
 #include "gl/GrGLUtil.h"
 
-GpuTimer::GpuTimer(const SkGLContextHelper* glctx) : fContext(glctx) {
+GpuTimer::GpuTimer(const SkGLContext* glctx) : fContext(glctx) {
     if (fContext) {
         fContext->ref();
         fContext->makeCurrent();
diff --git a/tools/timer/GpuTimer.h b/tools/timer/GpuTimer.h
index 2100312a21..da1fdab5c0 100644
--- a/tools/timer/GpuTimer.h
+++ b/tools/timer/GpuTimer.h
@@ -7,18 +7,18 @@
 #ifndef GpuTimer_DEFINED
 #define GpuTimer_DEFINED
 
-class SkGLContextHelper;
+class SkGLContext;
 
 class GpuTimer {
 public:
-    GpuTimer(const SkGLContextHelper*);
+    GpuTimer(const SkGLContext*);
     ~GpuTimer();
     void start();
     double end();
 private:
     unsigned fQuery;
     int fStarted;
-    const SkGLContextHelper* fContext;
+    const SkGLContext* fContext;
     bool fSupported;
 };
 
diff --git a/tools/timer/Timer.cpp b/tools/timer/Timer.cpp
index 4f3fc85cff..a9f04afe75 100644
--- a/tools/timer/Timer.cpp
+++ b/tools/timer/Timer.cpp
@@ -6,7 +6,7 @@
  */
 #include "Timer.h"
 
-Timer::Timer(SkGLContextHelper* gl)
+Timer::Timer(SkGLContext* gl)
         : fCpu(-1.0)
         , fWall(-1.0)
         , fTruncatedCpu(-1.0)
diff --git a/tools/timer/Timer.h b/tools/timer/Timer.h
index 15c93f5603..81d1ca50ef 100644
--- a/tools/timer/Timer.h
+++ b/tools/timer/Timer.h
@@ -21,7 +21,7 @@
     #include "GpuTimer.h"
 #endif
 
-class SkGLContextHelper;
+class SkGLContext;
 
 /**
  * SysTimers and GpuTimers are implemented orthogonally.
@@ -34,7 +34,7 @@ class SkGLContextHelper;
  */
 class Timer {
 public:
-    explicit Timer(SkGLContextHelper* gl = NULL);
+    explicit Timer(SkGLContext* gl = NULL);
 
     void start();
     void truncatedEnd();
-- 
cgit v1.2.3