Changeset 157279 in webkit

Timestamp:

Oct 10, 2013, 5:30:29 PM (12 years ago)

Author:

Simon Fraser

Message:

Always force layout before flushing compositing layers
​https://bugs.webkit.org/show_bug.cgi?id=122626

Reviewed by Tim Horton.

[m_webView _flushCompositingChanges] only actually flushes compositing
layers if the FrameView does not need layout (FrameView::flushCompositingStateForThisFrame()
returns in this case). In this situation, flushLayers() does actually try
to force a layout, but on some platforms it's possible for something else
to dirty layout before the runloop observer fires again. This can result
in flushLayers() never actually managing to flush, which stalls visual
updates.

Fix by always calling -viewWillDraw (which updates layout) before flushing
layers. This now matches WebKit2 behavior.

• WebView/WebView.mm:

(LayerFlushController::flushLayers):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-10-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Always force layout before flushing compositing layers
+        https://bugs.webkit.org/show_bug.cgi?id=122626
+
+        Reviewed by Tim Horton.
+        
+        [m_webView _flushCompositingChanges] only actually flushes compositing
+        layers if the FrameView does not need layout (FrameView::flushCompositingStateForThisFrame()
+        returns in this case). In this situation, flushLayers() does actually try
+        to force a layout, but on some platforms it's possible for something else
+        to dirty layout before the runloop observer fires again. This can result
+        in flushLayers() never actually managing to flush, which stalls visual
+        updates.
+        
+        Fix by always calling -viewWillDraw (which updates layout) before flushing
+        layers. This now matches WebKit2 behavior.
+
+        * WebView/WebView.mm:
+        (LayerFlushController::flushLayers):
+
 2013-10-10  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -6511 +6511 @@
         return false;
 
+    [m_webView _viewWillDrawInternal];
+
     if ([m_webView _flushCompositingChanges]) {
         // AppKit may have disabled screen updates, thinking an upcoming window flush will re-enable them.
@@ -6520 +6522 @@
         return true;
     }
-
-    // Since the WebView does not need display, -viewWillDraw will not be called. Perform pending layout now,
-    // so that the layers draw with up-to-date layout. 
-    [m_webView _viewWillDrawInternal];
 
     return false;