Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / gl / GrGLInterface.cpp

diff --git a/src/third_party/skia/src/gpu/gl/GrGLInterface.cpp b/src/third_party/skia/src/gpu/gl/GrGLInterface.cpp
index c192611..063de56 100644 (file)
--- a/src/third_party/skia/src/gpu/gl/GrGLInterface.cpp
+++ b/src/third_party/skia/src/gpu/gl/GrGLInterface.cpp
@@ -61,6 +61,7 @@ const GrGLInterface* GrGLInterfaceRemoveNVPR(const GrGLInterface* interface) {
     newInterface->fFunctions.fStencilThenCoverFillPathInstanced = NULL;
     newInterface->fFunctions.fStencilThenCoverStrokePathInstanced = NULL;
     newInterface->fFunctions.fProgramPathFragmentInputGen = NULL;
+    newInterface->fFunctions.fPathMemoryGlyphIndexArray = NULL;
     return newInterface;
 }
 
@@ -74,7 +75,7 @@ GrGLInterface::GrGLInterface() {
 }
 
 GrGLInterface* GrGLInterface::NewClone(const GrGLInterface* interface) {
-    SkASSERT(NULL != interface);
+    SkASSERT(interface);
 
     GrGLInterface* clone = SkNEW(GrGLInterface);
     clone->fStandard = interface->fStandard;
@@ -485,7 +486,8 @@ bool GrGLInterface::validate() const {
                 NULL == fFunctions.fStencilThenCoverStrokePath ||
                 NULL == fFunctions.fStencilThenCoverFillPathInstanced ||
                 NULL == fFunctions.fStencilThenCoverStrokePathInstanced ||
-                NULL == fFunctions.fProgramPathFragmentInputGen) {
+                NULL == fFunctions.fProgramPathFragmentInputGen ||
+                NULL == fFunctions.fPathMemoryGlyphIndexArray) {
                 RETURN_FALSE_INTERFACE
             }
         }