Changeset 104194 in webkit

Timestamp:

Jan 5, 2012 12:18:59 PM (12 years ago)

Author:

Martin Robinson

Message:

[GTK] [AC] Introduce AcceleratedCompositingContext to isolate different accelerated compositing implementations
​https://bugs.webkit.org/show_bug.cgi?id=75519

Reviewed by Alejandro G. Castro.

Add an AcceleratedCompositingContext which will isolate all the different accelerated compositing
implementations from one another. For right now this just includes the Clutter version.

• GNUmakefile.am: Add the new files to the source list.
• WebCoreSupport/AcceleratedCompositingContext.h: Added.
• WebCoreSupport/AcceleratedCompositingContextClutter.cpp: Added. Existing

clutter AC code has moved here.

• WebCoreSupport/ChromeClientGtk.cpp:

(WebKit::ChromeClient::attachRootGraphicsLayer): Use the new AccleratedCompositingContext now
instead of calling into the WebView.
(WebKit::ChromeClient::setNeedsOneShotDrawingSynchronization):Ditto.
(WebKit::ChromeClient::scheduleCompositingLayerSync): Ditto.

• webkit/webkitwebview.cpp:

(webkit_web_view_size_allocate): Call in the ACContext.
(webkit_web_view_init): Initialize the ACContext.

• webkit/webkitwebviewprivate.h: Add the ACContext as a private member.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• WebCoreSupport/AcceleratedCompositingContext.h (added)
• WebCoreSupport/AcceleratedCompositingContextClutter.cpp (added)
• WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (4 diffs)
• webkit/webkitwebviewprivate.h (modified) (4 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-01-05  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [AC] Introduce AcceleratedCompositingContext to isolate different accelerated compositing implementations
+        https://bugs.webkit.org/show_bug.cgi?id=75519
+
+        Reviewed by Alejandro G. Castro.
+
+        Add an AcceleratedCompositingContext which will isolate all the different accelerated compositing
+        implementations from one another. For right now this just includes the Clutter version.
+
+        * GNUmakefile.am: Add the new files to the source list.
+        * WebCoreSupport/AcceleratedCompositingContext.h: Added.
+        * WebCoreSupport/AcceleratedCompositingContextClutter.cpp: Added. Existing
+        clutter AC code has moved here.
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::attachRootGraphicsLayer): Use the new AccleratedCompositingContext now
+        instead of calling into the WebView.
+        (WebKit::ChromeClient::setNeedsOneShotDrawingSynchronization):Ditto.
+        (WebKit::ChromeClient::scheduleCompositingLayerSync): Ditto.
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_size_allocate): Call in the ACContext.
+        (webkit_web_view_init): Initialize the ACContext.
+        * webkit/webkitwebviewprivate.h: Add the ACContext as a private member.
+
 2012-01-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/gtk/GNUmakefile.am

@@ -185 +185 @@
         Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \
         Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \
+        Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h \
+        Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp \
         Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp \
         Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \

trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -928 +928 @@
 void ChromeClient::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* rootLayer)
 {
-    if (rootLayer)
-        webViewSetRootGraphicsLayer(m_webView, rootLayer);
-    else
-        webViewDetachRootGraphicsLayer(m_webView);
+    m_webView->priv->acceleratedCompositingContext->attachRootGraphicsLayer(rootLayer);
 }
 
 void ChromeClient::setNeedsOneShotDrawingSynchronization()
 {
-    webViewMarkForSync(m_webView, FALSE);
+    m_webView->priv->acceleratedCompositingContext->markForSync();
 }
 
 void ChromeClient::scheduleCompositingLayerSync()
 {
-    webViewMarkForSync(m_webView, TRUE);
+    m_webView->priv->acceleratedCompositingContext->markForSync();
 }
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -8 +8 @@
  *  Copyright (C) 2008 Nuanti Ltd.
  *  Copyright (C) 2008, 2009, 2010 Collabora Ltd.
- *  Copyright (C) 2009, 2010 Igalia S.L.
+ *  Copyright (C) 2009, 2010, 2012 Igalia S.L.
  *  Copyright (C) 2009 Movial Creative Technologies Inc.
  *  Copyright (C) 2009 Bobby Powers
@@ -873 +873 @@
     chromeClient->adjustmentWatcher()->updateAdjustmentsFromScrollbars();
 
-#if USE(ACCELERATED_COMPOSITING) && USE(CLUTTER)
-    if (webView->priv->rootLayerEmbedder) {
-        allocation->x = 0;
-        allocation->y = 0;
-        gtk_widget_size_allocate(GTK_WIDGET(webView->priv->rootLayerEmbedder), allocation);
-    }
+#if USE(ACCELERATED_COMPOSITING)
+    WEBKIT_WEB_VIEW(widget)->priv->acceleratedCompositingContext->resizeRootLayer(IntSize(allocation->width, allocation->height));
 #endif
 }
@@ -3338 +3334 @@
 
     priv->selfScrolling = false;
+
+#if USE(ACCELERATED_COMPOSITING)
+    priv->acceleratedCompositingContext = AcceleratedCompositingContext::create(webView);
+#endif
 }
 
@@ -4910 +4910 @@
 }
 
-#if USE(ACCELERATED_COMPOSITING)
-void webViewSetRootGraphicsLayer(WebKitWebView* webView, GraphicsLayer* graphicsLayer)
-{
-#if USE(CLUTTER)
-    WebKitWebViewPrivate* priv = webView->priv;
-
-    // Create an instance of GtkClutterEmbed to host actors as web layers.
-    if (!priv->rootLayerEmbedder) {
-        priv->rootLayerEmbedder = gtk_clutter_embed_new();
-        gtk_container_add(GTK_CONTAINER(webView), priv->rootLayerEmbedder);
-        gtk_widget_show(priv->rootLayerEmbedder);
-    }
-
-    // Add a root layer to the stage.
-    if (graphicsLayer) {
-        priv->rootGraphicsLayer = graphicsLayer;
-        // set white background
-        ClutterColor stageColor = { 0xFF, 0xFF, 0xFF, 0xFF };
-        ClutterActor* stage = gtk_clutter_embed_get_stage(GTK_CLUTTER_EMBED(priv->rootLayerEmbedder));
-        clutter_stage_set_color(CLUTTER_STAGE (stage), &stageColor);
-        clutter_container_add_actor(CLUTTER_CONTAINER(stage), priv->rootGraphicsLayer->platformLayer());
-        clutter_actor_show_all(stage);
-    }
-#else
-    notImplemented();
-#endif
-}
-
-void webViewDetachRootGraphicsLayer(WebKitWebView* webView)
-{
-#if USE(CLUTTER)
-    WebKitWebViewPrivate* priv = webView->priv;
-    // Detach the root layer from the hosting view.
-    gtk_container_remove(GTK_CONTAINER(webView), priv->rootLayerEmbedder);
-    priv->rootLayerEmbedder = 0;
-    priv->rootGraphicsLayer = 0;
-#else
-    notImplemented();
-#endif
-}
-
-#if USE(CLUTTER)
-static gboolean webViewSyncLayers(gpointer data)
-{
-    WebKitWebView* webView = WEBKIT_WEB_VIEW(data);
-    core(webView)->mainFrame()->view()->syncCompositingStateIncludingSubframes();
-
-    return FALSE;
-}
-#endif
-
-void webViewMarkForSync(WebKitWebView* webView, gboolean scheduleSync)
-{
-#if USE(CLUTTER)
-    g_timeout_add(0, webViewSyncLayers, webView);
-#else
-    notImplemented();
-#endif
-}
-
-#endif
-
 namespace WebKit {
 

trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h

@@ -24 +24 @@
 #define webkitwebviewprivate_h
 
+#include "AcceleratedCompositingContext.h"
 #include "FullscreenVideoController.h"
 #include "GtkClickCounter.h"
@@ -32 +33 @@
 #include "WidgetBackingStore.h"
 #include <webkit/webkitwebview.h>
-
-#if USE(ACCELERATED_COMPOSITING) && USE(CLUTTER)
-#include <clutter-gtk/clutter-gtk.h>
-#include <clutter/clutter.h>
-#endif
 
 namespace WebKit {
@@ -98 +94 @@
     WebCore::GtkDragAndDropHelper dragAndDropHelper;
     bool selfScrolling;
-#if USE(ACCELERATED_COMPOSITING) && USE(CLUTTER)
-    WebCore::GraphicsLayer* rootGraphicsLayer;
-    GtkWidget* rootLayerEmbedder;
+
+#if USE(ACCELERATED_COMPOSITING)
+    OwnPtr<WebKit::AcceleratedCompositingContext> acceleratedCompositingContext;
 #endif
 };
@@ -121 +117 @@
 void webViewEnterFullscreen(WebKitWebView* webView, WebCore::Node*);
 void webViewExitFullscreen(WebKitWebView* webView);
-
-#if USE(ACCELERATED_COMPOSITING)
-void webViewSetRootGraphicsLayer(WebKitWebView*, WebCore::GraphicsLayer*);
-void webViewDetachRootGraphicsLayer(WebKitWebView*);
-void webViewMarkForSync(WebKitWebView*, gboolean);
-#endif
 }