Changeset 137447 in webkit

Timestamp:

Dec 12, 2012 3:34:46 AM (5 years ago)

Author:

joone.hur@intel.com

Message:

[GTK][AC] GraphicsLayers are not shown on the viewport
​https://bugs.webkit.org/show_bug.cgi?id=104670

Reviewed by Gustavo Noronha Silva.

GraphicsLayers are not shown on the viewport because the container(GtkClutterEmbed)
is not resized and shown, so this patch allows it to fit to the viewport.

• WebCoreSupport/AcceleratedCompositingContext.h:
• WebCoreSupport/AcceleratedCompositingContextClutter.cpp:

(WebKit::AcceleratedCompositingContext::renderLayersToWindow):
(WebKit::AcceleratedCompositingContext::setRootCompositingLayer):
(WebKit::AcceleratedCompositingContext::resizeRootLayer):
(WebKit::AcceleratedCompositingContext::layerFlushTimerFiredCallback):
(WebKit::AcceleratedCompositingContext::scheduleLayerFlush):

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/AcceleratedCompositingContext.h (modified) (1 diff)
• WebCoreSupport/AcceleratedCompositingContextClutter.cpp (modified) (6 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-12-12  Joone Hur  <joone.hur@intel.com>
+
+        [GTK][AC] GraphicsLayers are not shown on the viewport
+        https://bugs.webkit.org/show_bug.cgi?id=104670
+
+        Reviewed by Gustavo Noronha Silva.
+
+        GraphicsLayers are not shown on the viewport because the container(GtkClutterEmbed) 
+        is not resized and shown, so this patch allows it to fit to the viewport.
+
+        * WebCoreSupport/AcceleratedCompositingContext.h:
+        * WebCoreSupport/AcceleratedCompositingContextClutter.cpp:
+        (WebKit::AcceleratedCompositingContext::renderLayersToWindow):
+        (WebKit::AcceleratedCompositingContext::setRootCompositingLayer):
+        (WebKit::AcceleratedCompositingContext::resizeRootLayer):
+        (WebKit::AcceleratedCompositingContext::layerFlushTimerFiredCallback):
+        (WebKit::AcceleratedCompositingContext::scheduleLayerFlush):
+
 2012-12-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h

@@ -78 +78 @@
     WebCore::GraphicsLayer* m_rootGraphicsLayer;
     GtkWidget* m_rootLayerEmbedder;
+    static gboolean layerFlushTimerFiredCallback(AcceleratedCompositingContext*);
 #elif USE(TEXTURE_MAPPER_GL)
     OwnPtr<WebCore::RedirectedXCompositeWindow> m_redirectedWindow;

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

@@ -57 +57 @@
 {
     notImplemented();
-    return false;
+    return true;
 }
 
@@ -69 +69 @@
     }
 
-    // Create an instance of GtkClutterEmbed to host actors as web layers.
+    // Create an instance of GtkClutterEmbed to embed actors as GraphicsLayers.
     if (!m_rootLayerEmbedder) {
         m_rootLayerEmbedder = gtk_clutter_embed_new();
         gtk_container_add(GTK_CONTAINER(m_webView), m_rootLayerEmbedder);
+
+        GtkAllocation allocation;
+        gtk_widget_get_allocation(GTK_WIDGET(m_webView), &allocation);
+        gtk_widget_size_allocate(GTK_WIDGET(m_rootLayerEmbedder), &allocation);
         gtk_widget_show(m_rootLayerEmbedder);
     }
 
-    // Add a root layer to the stage.
+    // Add a root GraphicsLayer to the stage.
     if (graphicsLayer) {
         m_rootGraphicsLayer = graphicsLayer;
@@ -85 +89 @@
         clutter_actor_show_all(stage);
     }
+
+    scheduleLayerFlush();
 }
 
@@ -111 +117 @@
     allocation.height = size.height();
     gtk_widget_size_allocate(GTK_WIDGET(m_rootLayerEmbedder), &allocation);
+
+    scheduleLayerFlush();
 }
 
@@ -118 +126 @@
 }
 
-static gboolean flushAndRenderLayersCallback(AcceleratedCompositingContext* context)
+gboolean AcceleratedCompositingContext::layerFlushTimerFiredCallback(AcceleratedCompositingContext* context)
 {
     context->flushAndRenderLayers();
@@ -131 +139 @@
     // We use a GLib timer because otherwise GTK+ event handling during
     // dragging can starve WebCore timers, which have a lower priority.
-    m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 0, reinterpret_cast<GSourceFunc>(flushAndRenderLayersCallback), this, 0);
+    m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 0, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0);
 }