Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / include / gpu / GrContextFactory.h

diff --git a/src/third_party/skia/include/gpu/GrContextFactory.h b/src/third_party/skia/include/gpu/GrContextFactory.h
index f6677bb..d78120c 100644 (file)
--- a/src/third_party/skia/include/gpu/GrContextFactory.h
+++ b/src/third_party/skia/include/gpu/GrContextFactory.h
@@ -95,11 +95,11 @@ public:
 
     void destroyContexts() {
         for (int i = 0; i < fContexts.count(); ++i) {
-            if (NULL != fContexts[i].fGLContext) {  //  could be abandoned.
+            if (fContexts[i].fGLContext) {  //  could be abandoned.
                 fContexts[i].fGLContext->makeCurrent();
             }
             fContexts[i].fGrContext->unref();
-            if (NULL != fContexts[i].fGLContext) {
+            if (fContexts[i].fGLContext) {
                 fContexts[i].fGLContext->unref();
             }
         }
@@ -108,7 +108,7 @@ public:
 
     void abandonContexts() {
         for (int i = 0; i < fContexts.count(); ++i) {
-            if (NULL != fContexts[i].fGLContext) {
+            if (fContexts[i].fGLContext) {
                 fContexts[i].fGLContext->testAbandon();
                 SkSafeSetNull(fContexts[i].fGLContext);
             }
@@ -202,6 +202,8 @@ public:
         return NULL;
     }
 
+    const GrContext::Options& getGlobalOptions() const { return fGlobalOptions; }
+
 private:
     struct GPUContext {
         GLContextType             fType;