Refactor SkGLContext to be actually extendable

tools/timer/GpuTimer.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "GpuTimer.h"
 #include "gl/SkGLContext.h"
 #include "gl/GrGLUtil.h"
 
 GpuTimer::GpuTimer(const SkGLContext* glctx) : fContext(glctx) {
     if (fContext) {
         fContext->ref();
         fContext->makeCurrent();
         fStarted = false;
         fSupported = GrGLGetVersion(fContext->gl()) > GR_GL_VER(3,3) ||
-                     fContext->hasExtension("GL_ARB_timer_query") ||
-                     fContext->hasExtension("GL_EXT_timer_query");
+                fContext->gl()->hasExtension("GL_ARB_timer_query") ||
+                fContext->gl()->hasExtension("GL_EXT_timer_query");
 
         if (fSupported) {
             SK_GL(*fContext, GenQueries(1, &fQuery));
         }
     }
 }
 
 GpuTimer::~GpuTimer() {
     if (fContext) {
         if (fSupported) {
@@ skipping 38 matching lines @@
         GrGLuint64 totalGPUTimeElapsed = 0;
         SK_GL(*fContext, GetQueryObjectui64v(fQuery,
                                              GR_GL_QUERY_RESULT,
                                              &totalGPUTimeElapsed));
 
         return totalGPUTimeElapsed / 1000000.0;
     } else {
         return 0;
     }
 }