Changeset 86310 in webkit

Timestamp:

May 11, 2011 10:35:29 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-11 Brian Salomon <​bsalomon@google.com>

Reviewed by Eric Seidel.

Handle case when GrContext creation fails
​https://bugs.webkit.org/show_bug.cgi?id=60410

Exercised by all canvas tests when DRT is run with skia-gpu

• platform/graphics/gpu/SharedGraphicsContext3D.cpp: (WebCore::SharedGraphicsContext3D::grContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gpu/SharedGraphicsContext3D.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Brian Salomon  <bsalomon@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Handle case when GrContext creation fails
+        https://bugs.webkit.org/show_bug.cgi?id=60410
+
+        Exercised by all canvas tests when DRT is run with skia-gpu
+
+        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+        (WebCore::SharedGraphicsContext3D::grContext):
+
 2011-05-11  Pratik Solanki  <psolanki@apple.com>
 

trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp

@@ -484 +484 @@
     if (!m_grContext) {
         m_grContext = GrContext::CreateGLShaderContext();
-        m_grContext->setTextureCacheLimits(maxTextureCacheCount, maxTextureCacheBytes);
+        if (m_grContext)
+            m_grContext->setTextureCacheLimits(maxTextureCacheCount, maxTextureCacheBytes);
     }
     return m_grContext;