Changeset 224198 in webkit

Timestamp:

Oct 30, 2017 1:31:22 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r224078.
​https://bugs.webkit.org/show_bug.cgi?id=179026

MotionMark regression (Requested by shallawa on #webkit).

Reverted changeset:

"When navigating back to a page, compositing layers may not
use accelerated drawing"
​https://bugs.webkit.org/show_bug.cgi?id=178749
​https://trac.webkit.org/changeset/224078

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/accelerated-layers-after-back-expected.txt (deleted)
• LayoutTests/compositing/accelerated-layers-after-back.html (deleted)
• LayoutTests/compositing/iframes/page-cache-layer-tree.html (modified) (1 diff)
• LayoutTests/compositing/iframes/resources/page-cache-helper.html (moved) (moved from trunk/LayoutTests/compositing/resources/go-back.html)
• LayoutTests/compositing/page-cache-back-crash.html (modified) (1 diff)
• LayoutTests/compositing/tiling/tiled-drawing-async-frame-scrolling.html (modified) (1 diff)
• LayoutTests/platform/ios/compositing/accelerated-layers-after-back-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (5 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.h (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/TestOptions.h (modified) (1 diff)
• Tools/DumpRenderTree/TestOptions.mm (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/TestOptions.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-30  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r224078.
+        https://bugs.webkit.org/show_bug.cgi?id=179026
+
+        MotionMark regression (Requested by shallawa on #webkit).
+
+        Reverted changeset:
+
+        "When navigating back to a page, compositing layers may not
+        use accelerated drawing"
+        https://bugs.webkit.org/show_bug.cgi?id=178749
+        https://trac.webkit.org/changeset/224078
+
 2017-10-30  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/compositing/iframes/page-cache-layer-tree.html

@@ -74 +74 @@
     window.addEventListener("load", function(event) {
         setTimeout(function() {
-            window.location.href = "../resources/go-back.html";
+            window.location.href = "resources/page-cache-helper.html";
         }, 0);
     }, false);

trunk/LayoutTests/compositing/page-cache-back-crash.html

@@ -20 +20 @@
     setTimeout(function() {
         // Navigate to a helper page that will immediately navigate back here after loading.
-        window.location.href = "resources/go-back.html";
+        window.location.href = "iframes/resources/page-cache-helper.html";
     }, 0);
 });

trunk/LayoutTests/compositing/tiling/tiled-drawing-async-frame-scrolling.html

@@ -10 +10 @@
             testRunner.dumpAsText();
             testRunner.waitUntilDone();
-        }
+        }
 
         function doTest()

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-30  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r224078.
+        https://bugs.webkit.org/show_bug.cgi?id=179026
+
+        MotionMark regression (Requested by shallawa on #webkit).
+
+        Reverted changeset:
+
+        "When navigating back to a page, compositing layers may not
+        use accelerated drawing"
+        https://bugs.webkit.org/show_bug.cgi?id=178749
+        https://trac.webkit.org/changeset/224078
+
 2017-10-30  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -800 +800 @@
         return;
 
+    // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
+    renderView->compositor().cacheAcceleratedCompositingFlags();
     renderView->compositor().updateCompositingLayers(CompositingUpdateType::AfterLayout);
 }

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1754 +1754 @@
         updateCoverage(commitState);
 
-    if (m_uncommittedChanges & AcceleratesDrawingChanged) // Needs to happen before TilingAreaChanged.
-        updateAcceleratesDrawing();
-
     if (m_uncommittedChanges & TilingAreaChanged) // Needs to happen after CoverageRectChanged, ContentsScaleChanged
         updateTiles();
@@ -1779 +1776 @@
         updateContentsNeedsDisplay();
     
+    if (m_uncommittedChanges & AcceleratesDrawingChanged)
+        updateAcceleratesDrawing();
+
     if (m_uncommittedChanges & SupportsSubpixelAntialiasedTextChanged)
         updateSupportsSubpixelAntialiasedText();

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -300 +300 @@
 void RenderLayerCompositor::cacheAcceleratedCompositingFlags()
 {
+    bool hasAcceleratedCompositing = false;
+    bool showDebugBorders = false;
+    bool showRepaintCounter = false;
+    bool forceCompositingMode = false;
+    bool acceleratedDrawingEnabled = false;
+    bool displayListDrawingEnabled = false;
+
     auto& settings = m_renderView.settings();
-    bool hasAcceleratedCompositing = settings.acceleratedCompositingEnabled();
+    hasAcceleratedCompositing = settings.acceleratedCompositingEnabled();
 
     // We allow the chrome to override the settings, in case the page is rendered
@@ -310 +317 @@
     }
 
-    bool showDebugBorders = settings.showDebugBorders();
-    bool showRepaintCounter = settings.showRepaintCounter();
-    bool forceCompositingMode = settings.forceCompositingMode() && hasAcceleratedCompositing;
-    bool acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled();
-    bool displayListDrawingEnabled = settings.displayListDrawingEnabled();
+    showDebugBorders = settings.showDebugBorders();
+    showRepaintCounter = settings.showRepaintCounter();
+    forceCompositingMode = settings.forceCompositingMode() && hasAcceleratedCompositing;
+
+    if (forceCompositingMode && !isMainFrameCompositor())
+        forceCompositingMode = requiresCompositingForScrollableFrame();
+
+    acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled();
+    displayListDrawingEnabled = settings.displayListDrawingEnabled();
     
     if (hasAcceleratedCompositing != m_hasAcceleratedCompositing || showDebugBorders != m_showDebugBorders || showRepaintCounter != m_showRepaintCounter || forceCompositingMode != m_forceCompositingMode)
@@ -339 +350 @@
 }
 
-void RenderLayerCompositor::cacheAcceleratedCompositingFlagsAfterLayout()
-{
-    cacheAcceleratedCompositingFlags();
-    if (isMainFrameCompositor() || !m_forceCompositingMode)
-        return;
-
-    if (!requiresCompositingForScrollableFrame()) {
-        m_forceCompositingMode = false;
-        setCompositingLayersNeedRebuild();
-    }
-}
-
 bool RenderLayerCompositor::canRender3DTransforms() const
 {
@@ -365 +364 @@
 {
     m_layerNeedsCompositingUpdate = false;
+}
+
+bool RenderLayerCompositor::didRecalcStyleWithNoPendingLayout()
+{
+    if (!m_layerNeedsCompositingUpdate)
+        return false;
+    
     cacheAcceleratedCompositingFlags();
-}
-
-bool RenderLayerCompositor::didRecalcStyleWithNoPendingLayout()
-{
-    if (!m_layerNeedsCompositingUpdate)
-        return false;
-    
     return updateCompositingLayers(CompositingUpdateType::AfterStyleChange);
 }
@@ -635 +634 @@
 {
     LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " updateCompositingLayers " << updateType << " root " << updateRoot);
-
-    if (updateType == CompositingUpdateType::AfterStyleChange || updateType == CompositingUpdateType::AfterLayout)
-        cacheAcceleratedCompositingFlagsAfterLayout(); // Some flags (e.g. forceCompositingMode) depend on layout.
 
     m_updateCompositingLayersTimer.stop();

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -111 +111 @@
     bool canRender3DTransforms() const;
 
+    // Copy the accelerated compositing related flags from Settings
+    void cacheAcceleratedCompositingFlags();
+
     // Called when the layer hierarchy needs to be updated (compositing layers have been
     // created, destroyed or re-parented).
@@ -343 +346 @@
     // GraphicsLayerUpdaterClient implementation
     void flushLayersSoon(GraphicsLayerUpdater&) override;
-
-    // Copy the accelerated compositing related flags from Settings
-    void cacheAcceleratedCompositingFlags();
-    void cacheAcceleratedCompositingFlagsAfterLayout();
 
     // Whether the given RL needs a compositing layer.

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-30  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r224078.
+        https://bugs.webkit.org/show_bug.cgi?id=179026
+
+        MotionMark regression (Requested by shallawa on #webkit).
+
+        Reverted changeset:
+
+        "When navigating back to a page, compositing layers may not
+        use accelerated drawing"
+        https://bugs.webkit.org/show_bug.cgi?id=178749
+        https://trac.webkit.org/changeset/224078
+
 2017-10-30  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm

@@ -73 +73 @@
 void RemoteLayerBackingStore::ensureBackingStore(FloatSize size, float scale, bool acceleratesDrawing, bool deepColor, bool isOpaque)
 {
-#if !USE(IOSURFACE)
-    acceleratesDrawing = false;
-#endif
     if (m_size == size && m_scale == scale && m_deepColor == deepColor && m_acceleratesDrawing == acceleratesDrawing && m_isOpaque == isOpaque)
         return;

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-30  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r224078.
+        https://bugs.webkit.org/show_bug.cgi?id=179026
+
+        MotionMark regression (Requested by shallawa on #webkit).
+
+        Reverted changeset:
+
+        "When navigating back to a page, compositing layers may not
+        use accelerated drawing"
+        https://bugs.webkit.org/show_bug.cgi?id=178749
+        https://trac.webkit.org/changeset/224078
+
 2017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Tools/DumpRenderTree/TestOptions.h

@@ -31 +31 @@
 struct TestOptions {
     bool enableAttachmentElement { false };
-    bool useAcceleratedDrawing { false };
     bool enableIntersectionObserver { false };
     bool enableModernMediaControls { true };

trunk/Tools/DumpRenderTree/TestOptions.mm

@@ -81 +81 @@
         if (key == "enableAttachmentElement")
             this->enableAttachmentElement = parseBooleanTestHeaderValue(value);
-        if (key == "useAcceleratedDrawing")
-            this->useAcceleratedDrawing = parseBooleanTestHeaderValue(value);
         else if (key == "enableIntersectionObserver")
             this->enableIntersectionObserver = parseBooleanTestHeaderValue(value);

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -983 +983 @@
 
     preferences.attachmentElementEnabled = options.enableAttachmentElement;
-    preferences.acceleratedDrawingEnabled = options.useAcceleratedDrawing;
     preferences.intersectionObserverEnabled = options.enableIntersectionObserver;
     preferences.modernMediaControlsEnabled = options.enableModernMediaControls;

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -721 +721 @@
     WKPreferencesSetHiddenPageCSSAnimationSuspensionEnabled(preferences, false);
 
-    WKPreferencesSetAcceleratedDrawingEnabled(preferences, m_shouldUseAcceleratedDrawing || options.useAcceleratedDrawing);
+    WKPreferencesSetAcceleratedDrawingEnabled(preferences, m_shouldUseAcceleratedDrawing);
     // FIXME: We should be testing the default.
     WKPreferencesSetStorageBlockingPolicy(preferences, kWKAllowAllStorage);
@@ -1023 +1023 @@
         if (key == "useThreadedScrolling")
             testOptions.useThreadedScrolling = parseBooleanTestHeaderValue(value);
-        if (key == "useAcceleratedDrawing")
-            testOptions.useAcceleratedDrawing = parseBooleanTestHeaderValue(value);
         if (key == "useFlexibleViewport")
             testOptions.useFlexibleViewport = parseBooleanTestHeaderValue(value);

trunk/Tools/WebKitTestRunner/TestOptions.h

@@ -34 +34 @@
 struct TestOptions {
     bool useThreadedScrolling { false };
-    bool useAcceleratedDrawing { false };
     bool useRemoteLayerTree { false };
     bool shouldShowWebView { false };
@@ -67 +66 @@
     {
         if (useThreadedScrolling != options.useThreadedScrolling
-            || useAcceleratedDrawing != options.useAcceleratedDrawing
             || overrideLanguages != options.overrideLanguages
             || useMockScrollbars != options.useMockScrollbars