Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / tests / GLInterfaceValidationTest.cpp

diff --git a/src/third_party/skia/tests/GLInterfaceValidationTest.cpp b/src/third_party/skia/tests/GLInterfaceValidationTest.cpp
index 797ba72..1448f28 100755 (executable)
--- a/src/third_party/skia/tests/GLInterfaceValidationTest.cpp
+++ b/src/third_party/skia/tests/GLInterfaceValidationTest.cpp
@@ -17,20 +17,20 @@ DEF_GPUTEST(GLInterfaceValidation, reporter, factory) {
         GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType)i;
         // this forces the factory to make the context if it hasn't yet
         factory->get(glCtxType);
-        SkGLContextHelper* glCtxHelper = factory->getGLContext(glCtxType);
+        SkGLContext* glCtx = factory->getGLContext(glCtxType);
 
         // We're supposed to fail the NVPR context type when we the native context that does not
         // support the NVPR extension.
         if (GrContextFactory::kNVPR_GLContextType == glCtxType &&
             factory->getGLContext(GrContextFactory::kNative_GLContextType) &&
-            !factory->getGLContext(GrContextFactory::kNative_GLContextType)->hasExtension("GL_NV_path_rendering")) {
-            REPORTER_ASSERT(reporter, NULL == glCtxHelper);
+            !factory->getGLContext(GrContextFactory::kNative_GLContextType)->gl()->hasExtension("GL_NV_path_rendering")) {
+            REPORTER_ASSERT(reporter, NULL == glCtx);
             continue;
         }
 
-        REPORTER_ASSERT(reporter, glCtxHelper);
-        if (glCtxHelper) {
-            const GrGLInterface* interface = glCtxHelper->gl();
+        REPORTER_ASSERT(reporter, glCtx);
+        if (glCtx) {
+            const GrGLInterface* interface = glCtx->gl();
             REPORTER_ASSERT(reporter, interface->validate());
         }
     }