Changeset 93707 in webkit

Timestamp:

Aug 24, 2011 8:04:32 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[SKIA] Allow WebKitGraphicsContext3D implementation to provide a compatible GrGLInterface
​https://bugs.webkit.org/show_bug.cgi?id=66809

Patch by Brian Salomon <​bsalomon@google.com> on 2011-08-24
Reviewed by Stephen White.

• public/WebGraphicsContext3D.h:

(WebKit::WebGraphicsContext3D::grGLInterface):

• src/GraphicsContext3DChromium.cpp:

(WebCore::GraphicsContext3DInternal::grContext):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebGraphicsContext3D.h (modified) (2 diffs)
• src/GraphicsContext3DChromium.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-24  Brian Salomon  <bsalomon@google.com>
+
+        [SKIA] Allow WebKitGraphicsContext3D implementation to provide a compatible GrGLInterface
+        https://bugs.webkit.org/show_bug.cgi?id=66809
+
+        Reviewed by Stephen White.
+
+        * public/WebGraphicsContext3D.h:
+        (WebKit::WebGraphicsContext3D::grGLInterface):
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DInternal::grContext):
+
 2011-08-23  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/chromium/public/WebGraphicsContext3D.h

@@ -61 +61 @@
 typedef WGC3Duint WebGLId;
 
+#if WEBKIT_USING_SKIA
+struct GrGLInterface;
+#endif
+
 class WebView;
 
@@ -356 +360 @@
     // state is sticky, rather than reported only once.
     virtual WGC3Denum getGraphicsResetStatusARB() { return 0; /* GL_NO_ERROR */ }
+
+#if WEBKIT_USING_SKIA
+    virtual GrGLInterface* grGLInterface() { return 0; }
+#endif
 };
 

trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@ -165 +165 @@
 
     if (!m_grContext) {
-        m_grContext = GrContext::CreateGLShaderContext();
+        GrPlatform3DContext glinterface = reinterpret_cast<GrPlatform3DContext>(m_impl->grGLInterface());
+        m_grContext = GrContext::Create(kOpenGL_Shaders_GrEngine, glinterface);
         if (m_grContext)
             m_grContext->setTextureCacheLimits(maxTextureCacheCount, maxTextureCacheBytes);