Changeset 106371 in webkit

Timestamp:

Jan 31, 2012 11:11:54 AM (12 years ago)

Author:

piman@chromium.org

Message:

Merge WebGraphicsContext3D creation and initialization, and move it to
WebViewClient.
​https://bugs.webkit.org/show_bug.cgi?id=76593

Reviewed by Darin Fisher.

Source/WebKit/chromium:

• public/WebViewClient.h:

(WebKit::WebViewClient::createGraphicsContext3D):

• public/platform/WebGraphicsContext3D.h:

(WebKit::WebGraphicsContext3D::initialize):

• public/platform/WebKitPlatformSupport.h:
• src/GraphicsContext3DChromium.cpp:

Tools:

• DumpRenderTree/chromium/TestWebPlugin.cpp:

(TestWebPlugin::TestWebPlugin):
(TestWebPlugin::initialize):

• DumpRenderTree/chromium/TestWebPlugin.h:
• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::createGraphicsContext3D):
(WebViewHost::createPlugin):

• DumpRenderTree/chromium/WebViewHost.h:

Location:

trunk

Files:

• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebViewClient.h (modified) (2 diffs)
• Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h (modified) (1 diff)
• Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (modified) (2 diffs)
• Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/TestWebPlugin.cpp (modified) (3 diffs)
• Tools/DumpRenderTree/chromium/TestWebPlugin.h (modified) (3 diffs)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (2 diffs)
• Tools/DumpRenderTree/chromium/WebViewHost.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-01-31  Antoine Labour  <piman@chromium.org>
+
+        Merge WebGraphicsContext3D creation and initialization, and move it to
+        WebViewClient.
+        https://bugs.webkit.org/show_bug.cgi?id=76593
+
+        Reviewed by Darin Fisher.
+
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::createGraphicsContext3D):
+        * public/platform/WebGraphicsContext3D.h:
+        (WebKit::WebGraphicsContext3D::initialize):
+        * public/platform/WebKitPlatformSupport.h:
+        * src/GraphicsContext3DChromium.cpp:
+
 2012-01-26  Hans Wennborg  <hans@chromium.org>
 

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

@@ -43 +43 @@
 #include "WebWidgetClient.h"
 #include "platform/WebColor.h"
+#include "platform/WebGraphicsContext3D.h"
 #include "platform/WebString.h"
 
@@ -110 +111 @@
     virtual WebStorageNamespace* createSessionStorageNamespace(unsigned quota) { return 0; }
 
+    // Creates a graphics context associated with the client's WebView.
+    // renderDirectlyToWebView means whether the context should be setup to
+    // render directly to the WebView (e.g. compositor context), or to an
+    // offscreen surface (e.g. WebGL context).
+    virtual WebGraphicsContext3D* createGraphicsContext3D(const WebGraphicsContext3D::Attributes&, bool renderDirectlyToWebView) { return 0; }
+
     // Misc ----------------------------------------------------------------
 

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

@@ -134 +134 @@
     virtual ~WebGraphicsContext3D() {}
 
-    // Initializes the graphics context; should be the first operation performed
-    // on newly-constructed instances. Returns true on success.
-    virtual bool initialize(Attributes, WebView*, bool renderDirectlyToWebView) = 0;
+    // This function is deprecated and will be removed soon.
+    virtual bool initialize(Attributes, WebView*, bool renderDirectlyToWebView) { return false; }
 
     // Makes the OpenGL context current on the current thread. Returns true on

trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h

@@ -37 +37 @@
 #include "WebData.h"
 #include "WebGamepads.h"
+#include "WebGraphicsContext3D.h"
 #include "WebLocalizedString.h"
 #include "WebSerializedScriptValue.h"
@@ -314 +315 @@
     virtual void callOnMainThread(void (*func)(void*), void* context) { }
 
-    // WebGL --------------------------------------------------------------
-
-    // May return null if WebGL is not supported.
-    // Returns newly allocated WebGraphicsContext3D instance.
-    virtual WebGraphicsContext3D* createGraphicsContext3D() { return 0; }
+    // GPU ----------------------------------------------------------------
+    //
+    // May return null if GPU is not supported.
+    // Returns newly allocated and initialized offscreen WebGraphicsContext3D instance.
+    virtual WebGraphicsContext3D* createOffscreenGraphicsContext3D(const WebGraphicsContext3D::Attributes&) { return 0; }
 
     // Audio --------------------------------------------------------------

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

@@ -47 +47 @@
 #include "ImageData.h"
 #include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
+#include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "platform/WebGraphicsContext3D.h"
+#include "platform/WebKitPlatformSupport.h"
 
 #include <stdio.h>
@@ -152 +153 @@
     webAttributes.shareResources = attrs.shareResources;
     webAttributes.forUseOnAnotherThread = threadUsage == GraphicsContext3DPrivate::ForUseOnAnotherThread;
-    OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::webKitPlatformSupport()->createGraphicsContext3D());
-    if (!webContext)
-        return 0;
 
     Chrome* chrome = static_cast<Chrome*>(hostWindow);
     WebKit::WebViewImpl* webViewImpl = chrome ? static_cast<WebKit::WebViewImpl*>(chrome->client()->webView()) : 0;
-
-    if (!webContext->initialize(webAttributes, webViewImpl, renderDirectlyToHostWindow))
+    OwnPtr<WebKit::WebGraphicsContext3D> webContext;
+    if (!webViewImpl || !webViewImpl->client()) {
+        if (renderDirectlyToHostWindow)
+            return 0;
+        webContext = adoptPtr(WebKit::webKitPlatformSupport()->createOffscreenGraphicsContext3D(webAttributes));
+    } else
+        webContext = adoptPtr(webViewImpl->client()->createGraphicsContext3D(webAttributes, renderDirectlyToHostWindow));
+    if (!webContext)
         return 0;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-31  Antoine Labour  <piman@chromium.org>
+
+        Merge WebGraphicsContext3D creation and initialization, and move it to
+        WebViewClient.
+        https://bugs.webkit.org/show_bug.cgi?id=76593
+
+        Reviewed by Darin Fisher.
+
+        * DumpRenderTree/chromium/TestWebPlugin.cpp:
+        (TestWebPlugin::TestWebPlugin):
+        (TestWebPlugin::initialize):
+        * DumpRenderTree/chromium/TestWebPlugin.h:
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::createGraphicsContext3D):
+        (WebViewHost::createPlugin):
+        * DumpRenderTree/chromium/WebViewHost.h:
+
 2012-01-31  Gabor Rapcsanyi  <rgabor@webkit.org>
 

trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp

@@ -33 +33 @@
 #include "WebPluginContainer.h"
 #include "WebPluginParams.h"
+#include "WebViewClient.h"
 #include <wtf/Assertions.h>
 #include <wtf/text/CString.h>
@@ -62 +63 @@
 }
 
-TestWebPlugin::TestWebPlugin(WebKit::WebFrame* frame,
+TestWebPlugin::TestWebPlugin(WebKit::WebViewClient* webViewClient,
+                             WebKit::WebFrame* frame,
                              const WebKit::WebPluginParams& params)
-    : m_frame(frame)
+    : m_webViewClient(webViewClient)
+    , m_frame(frame)
     , m_container(0)
     , m_context(0)
@@ -102 +105 @@
 bool TestWebPlugin::initialize(WebPluginContainer* container)
 {
-    m_context = webKitPlatformSupport()->createGraphicsContext3D();
+    WebGraphicsContext3D::Attributes attrs;
+    m_context = m_webViewClient->createGraphicsContext3D(attrs, false);
     if (!m_context)
-        return false;
-
-    WebGraphicsContext3D::Attributes attrs;
-    if (!m_context->initialize(attrs, m_frame->view(), false))
         return false;
 

trunk/Tools/DumpRenderTree/chromium/TestWebPlugin.h

@@ -32 +32 @@
 namespace WebKit {
 class WebGraphicsContext3D;
+class WebViewClient;
 }
 
@@ -45 +46 @@
 class TestWebPlugin : public WebKit::WebPlugin {
 public:
-    TestWebPlugin(WebKit::WebFrame*, const WebKit::WebPluginParams&);
+    TestWebPlugin(WebKit::WebViewClient*, WebKit::WebFrame*, const WebKit::WebPluginParams&);
     virtual ~TestWebPlugin();
 
@@ -116 +117 @@
                          const WTF::CString& fragmentSource);
 
+    WebKit::WebViewClient* m_webViewClient;
     WebKit::WebFrame* m_frame;
     WebKit::WebPluginContainer* m_container;

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -273 +273 @@
 }
 
+WebKit::WebGraphicsContext3D* WebViewHost::createGraphicsContext3D(const WebKit::WebGraphicsContext3D::Attributes& attributes, bool direct)
+{
+    if (!webView())
+        return 0;
+    return webkit_support::CreateGraphicsContext3D(attributes, webView(), direct);
+}
+
 void WebViewHost::didAddMessageToConsole(const WebConsoleMessage& message, const WebString& sourceName, unsigned sourceLine)
 {
@@ -907 +914 @@
 {
     if (params.mimeType == TestWebPlugin::mimeType())
-        return new TestWebPlugin(frame, params);
+        return new TestWebPlugin(this, frame, params);
 
     return webkit_support::CreateWebPlugin(frame, params);

trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

@@ -130 +130 @@
     virtual WebKit::WebWidget* createPopupMenu(const WebKit::WebPopupMenuInfo&);
     virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(unsigned quota);
+    virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(const WebKit::WebGraphicsContext3D::Attributes&, bool direct);
     virtual void didAddMessageToConsole(const WebKit::WebConsoleMessage&, const WebKit::WebString& sourceName, unsigned sourceLine);
     virtual void didStartLoading();