Title: [186162] trunk/Source/WebKit2
Revision
186162
Author
[email protected]
Date
2015-06-30 19:03:23 -0700 (Tue, 30 Jun 2015)

Log Message

More Gtk/EFL fixing.

* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::flushPendingLayerChanges):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (186161 => 186162)


--- trunk/Source/WebKit2/ChangeLog	2015-07-01 02:01:59 UTC (rev 186161)
+++ trunk/Source/WebKit2/ChangeLog	2015-07-01 02:03:23 UTC (rev 186162)
@@ -1,3 +1,12 @@
+2015-06-30  Simon Fraser  <[email protected]>
+
+        More Gtk/EFL fixing.
+
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+        (WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+        (WebKit::LayerTreeHostGtk::flushPendingLayerChanges):
+
 2015-06-30  Andy VanWagoner  <[email protected]>
 
         Implement ECMAScript Internationalization API

Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (186161 => 186162)


--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp	2015-07-01 02:01:59 UTC (rev 186161)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp	2015-07-01 02:03:23 UTC (rev 186162)
@@ -196,7 +196,7 @@
 {
     // Because our view-relative overlay root layer is not attached to the FrameView's GraphicsLayer tree, we need to flush it manually.
     if (m_coordinator->mainContentsLayer())
-        m_coordinator->mainContentsLayer()->flushCompositingState(visibleContentRect);
+        m_coordinator->mainContentsLayer()->flushCompositingState(visibleContentRect,  m_webPage->mainFrame().view()->viewportIsStable());
 }
 
 void CoordinatedLayerTreeHost::performScheduledLayerFlush()

Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (186161 => 186162)


--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp	2015-07-01 02:01:59 UTC (rev 186161)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp	2015-07-01 02:03:23 UTC (rev 186162)
@@ -260,14 +260,15 @@
 
 bool LayerTreeHostGtk::flushPendingLayerChanges()
 {
-    m_rootLayer->flushCompositingStateForThisLayerOnly();
-    m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly();
+    bool viewportIsStable = m_webPage->corePage()->mainFrame().view()->viewportIsStable();
+    m_rootLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
+    m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
 
     if (!m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
         return false;
 
     if (m_viewOverlayRootLayer)
-        m_viewOverlayRootLayer->flushCompositingState(FloatRect(FloatPoint(), m_rootLayer->size()));
+        m_viewOverlayRootLayer->flushCompositingState(FloatRect(FloatPoint(), m_rootLayer->size()), viewportIsStable);
 
     downcast<GraphicsLayerTextureMapper>(*m_rootLayer).updateBackingStoreIncludingSubLayers();
     return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to