Diff
Modified: trunk/LayoutTests/ChangeLog (224031 => 224032)
--- trunk/LayoutTests/ChangeLog 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/LayoutTests/ChangeLog 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,3 +1,16 @@
+2017-10-26 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223984.
+
+ Caused LayoutTest assertion failures.
+
+ 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/223984
+
2017-10-25 Alex Christensen <[email protected]>
Rebase contentextensions test expectations
Deleted: trunk/LayoutTests/compositing/accelerated-layers-after-back-expected.txt (224031 => 224032)
--- trunk/LayoutTests/compositing/accelerated-layers-after-back-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/LayoutTests/compositing/accelerated-layers-after-back-expected.txt 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,45 +0,0 @@
-This layer should use 'acceleratesDrawing' after going back to this page.
-
-Before:
-
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (acceleratesDrawing 1)
- (children 1
- (GraphicsLayer
- (position 18.00 10.00)
- (bounds 222.00 222.00)
- (drawsContent 1)
- (acceleratesDrawing 1)
- )
- )
- )
- )
-)
-After:
-
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 785.00 653.00)
- (children 1
- (GraphicsLayer
- (bounds 785.00 653.00)
- (contentsOpaque 1)
- (acceleratesDrawing 1)
- (children 1
- (GraphicsLayer
- (position 18.00 10.00)
- (bounds 222.00 222.00)
- (drawsContent 1)
- (acceleratesDrawing 1)
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/compositing/accelerated-layers-after-back.html (224031 => 224032)
--- trunk/LayoutTests/compositing/accelerated-layers-after-back.html 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/LayoutTests/compositing/accelerated-layers-after-back.html 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,67 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useAcceleratedDrawing=true ] -->
-
-<html>
-<head>
- <style>
- .container {
- position: relative;
- height: 200px;
- width: 200px;
- margin: 10px;
- padding: 10px;
- border: 1px solid black;
- will-change: transform;
- }
- </style>
- <script>
- var jsTestIsAsync = true;
-
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- window.testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
- }
-
- function doOnFirstLoad()
- {
- if (window.internals)
- document.getElementById('layers-before-navigate').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_ACCELERATES_DRAWING);
-
- setTimeout(function() {
- window.location.href = '';
- }, 0);
- }
-
- function doAfterBack()
- {
- if (window.internals)
- document.getElementById('layers-after-back').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_ACCELERATES_DRAWING);
-
- if (window.testRunner)
- testRunner.notifyDone();
- }
-
- window.addEventListener("pageshow", function(event) {
- if (event.persisted)
- setTimeout(doAfterBack, 0);
- }, false);
-
- function doTest()
- {
- doOnFirstLoad();
- }
-
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-<div class="container">
- <p>This layer should use 'acceleratesDrawing' after going back to this page.</p>
-</div>
-<h2>Before:</h2>
-<pre id="layers-before-navigate"></pre>
-<h2>After:</h2>
-<pre id="layers-after-back"></pre>
-
-</body>
-</html>
Modified: trunk/LayoutTests/compositing/iframes/page-cache-layer-tree.html (224031 => 224032)
--- trunk/LayoutTests/compositing/iframes/page-cache-layer-tree.html 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/LayoutTests/compositing/iframes/page-cache-layer-tree.html 2017-10-26 18:44:08 UTC (rev 224032)
@@ -73,7 +73,7 @@
// Force a back navigation back to this page.
window.addEventListener("load", function(event) {
setTimeout(function() {
- window.location.href = ""
+ window.location.href = ""
}, 0);
}, false);
</script>
Copied: trunk/LayoutTests/compositing/iframes/resources/page-cache-helper.html (from rev 224031, trunk/LayoutTests/compositing/resources/go-back.html) (0 => 224032)
--- trunk/LayoutTests/compositing/iframes/resources/page-cache-helper.html (rev 0)
+++ trunk/LayoutTests/compositing/iframes/resources/page-cache-helper.html 2017-10-26 18:44:08 UTC (rev 224032)
@@ -0,0 +1,8 @@
+This page should go back.
+<script>
+ window.addEventListener("load", function() {
+ setTimeout(function() {
+ history.back();
+ }, 0);
+ }, false);
+</script>
Modified: trunk/LayoutTests/compositing/page-cache-back-crash.html (224031 => 224032)
--- trunk/LayoutTests/compositing/page-cache-back-crash.html 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/LayoutTests/compositing/page-cache-back-crash.html 2017-10-26 18:44:08 UTC (rev 224032)
@@ -19,7 +19,7 @@
window.addEventListener("load", function() {
setTimeout(function() {
// Navigate to a helper page that will immediately navigate back here after loading.
- window.location.href = ""
+ window.location.href = ""
}, 0);
});
</script>
Deleted: trunk/LayoutTests/compositing/resources/go-back.html (224031 => 224032)
--- trunk/LayoutTests/compositing/resources/go-back.html 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/LayoutTests/compositing/resources/go-back.html 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,8 +0,0 @@
-This page should go back.
-<script>
- window.addEventListener("load", function() {
- setTimeout(function() {
- history.back();
- }, 0);
- }, false);
-</script>
Deleted: trunk/LayoutTests/platform/ios/compositing/accelerated-layers-after-back-expected.txt (224031 => 224032)
--- trunk/LayoutTests/platform/ios/compositing/accelerated-layers-after-back-expected.txt 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/LayoutTests/platform/ios/compositing/accelerated-layers-after-back-expected.txt 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,45 +0,0 @@
-This layer should use 'acceleratesDrawing' after going back to this page.
-
-Before:
-
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (acceleratesDrawing 1)
- (children 1
- (GraphicsLayer
- (position 18.00 10.00)
- (bounds 222.00 222.00)
- (drawsContent 1)
- (acceleratesDrawing 1)
- )
- )
- )
- )
-)
-After:
-
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 638.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 638.00)
- (contentsOpaque 1)
- (acceleratesDrawing 1)
- (children 1
- (GraphicsLayer
- (position 18.00 10.00)
- (bounds 222.00 222.00)
- (drawsContent 1)
- (acceleratesDrawing 1)
- )
- )
- )
- )
-)
-
Modified: trunk/Source/WebCore/ChangeLog (224031 => 224032)
--- trunk/Source/WebCore/ChangeLog 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Source/WebCore/ChangeLog 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,3 +1,16 @@
+2017-10-26 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223984.
+
+ Caused LayoutTest assertion failures.
+
+ 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/223984
+
2017-10-26 Youenn Fablet <[email protected]>
Add inspector logging for MediaElementSession autoplay
Modified: trunk/Source/WebCore/page/FrameView.cpp (224031 => 224032)
--- trunk/Source/WebCore/page/FrameView.cpp 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Source/WebCore/page/FrameView.cpp 2017-10-26 18:44:08 UTC (rev 224032)
@@ -892,6 +892,8 @@
if (!renderView)
return;
+ // This call will make sure the cached hasAcceleratedCompositing is updated from the pref
+ renderView->compositor().cacheAcceleratedCompositingFlags();
renderView->compositor().updateCompositingLayers(CompositingUpdateType::AfterLayout);
}
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (224031 => 224032)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1753,9 +1753,6 @@
if (m_uncommittedChanges & CoverageRectChanged)
updateCoverage(commitState);
- if (m_uncommittedChanges & AcceleratesDrawingChanged) // Needs to happen before TilingAreaChanged.
- updateAcceleratesDrawing();
-
if (m_uncommittedChanges & TilingAreaChanged) // Needs to happen after CoverageRectChanged, ContentsScaleChanged
updateTiles();
@@ -1778,6 +1775,9 @@
if (m_uncommittedChanges & ContentsNeedsDisplay)
updateContentsNeedsDisplay();
+ if (m_uncommittedChanges & AcceleratesDrawingChanged)
+ updateAcceleratesDrawing();
+
if (m_uncommittedChanges & SupportsSubpixelAntialiasedTextChanged)
updateSupportsSubpixelAntialiasedText();
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (224031 => 224032)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-10-26 18:44:08 UTC (rev 224032)
@@ -362,7 +362,6 @@
void RenderLayerCompositor::willRecalcStyle()
{
- cacheAcceleratedCompositingFlags();
m_layerNeedsCompositingUpdate = false;
}
@@ -371,6 +370,7 @@
if (!m_layerNeedsCompositingUpdate)
return false;
+ cacheAcceleratedCompositingFlags();
return updateCompositingLayers(CompositingUpdateType::AfterStyleChange);
}
@@ -634,9 +634,6 @@
{
LOG_WITH_STREAM(Compositing, stream << "RenderLayerCompositor " << this << " updateCompositingLayers " << updateType << " root " << updateRoot);
- if (updateType == CompositingUpdateType::AfterLayout)
- cacheAcceleratedCompositingFlags(); // Some flags (e.g. forceCompositingMode) depend on layout.
-
m_updateCompositingLayersTimer.stop();
ASSERT(m_renderView.document().pageCacheState() == Document::NotInPageCache);
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (224031 => 224032)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2017-10-26 18:44:08 UTC (rev 224032)
@@ -110,6 +110,9 @@
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).
void setCompositingLayersNeedRebuild(bool needRebuild = true);
@@ -357,9 +360,7 @@
void clearBackingForLayerIncludingDescendants(RenderLayer&);
- void cacheAcceleratedCompositingFlags();
-
- // Repaint the given layer and its descendants.
+ // Repaint this and its child layers.
void recursiveRepaintLayer(RenderLayer&);
void computeExtent(const OverlapMap&, const RenderLayer&, OverlapExtent&) const;
Modified: trunk/Source/WebKit/ChangeLog (224031 => 224032)
--- trunk/Source/WebKit/ChangeLog 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Source/WebKit/ChangeLog 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,3 +1,16 @@
+2017-10-26 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223984.
+
+ Caused LayoutTest assertion failures.
+
+ 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/223984
+
2017-10-26 Megan Gardner <[email protected]>
Remove code to update block selection
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm (224031 => 224032)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm 2017-10-26 18:44:08 UTC (rev 224032)
@@ -72,9 +72,6 @@
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;
Modified: trunk/Tools/ChangeLog (224031 => 224032)
--- trunk/Tools/ChangeLog 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Tools/ChangeLog 2017-10-26 18:44:08 UTC (rev 224032)
@@ -1,3 +1,16 @@
+2017-10-26 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223984.
+
+ Caused LayoutTest assertion failures.
+
+ 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/223984
+
2017-10-26 Christopher Reid <[email protected]>
Remove scopeguard from platform
Modified: trunk/Tools/DumpRenderTree/TestOptions.h (224031 => 224032)
--- trunk/Tools/DumpRenderTree/TestOptions.h 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Tools/DumpRenderTree/TestOptions.h 2017-10-26 18:44:08 UTC (rev 224032)
@@ -30,7 +30,6 @@
struct TestOptions {
bool enableAttachmentElement { false };
- bool useAcceleratedDrawing { false };
bool enableIntersectionObserver { false };
bool enableModernMediaControls { true };
bool enablePointerLock { false };
Modified: trunk/Tools/DumpRenderTree/TestOptions.mm (224031 => 224032)
--- trunk/Tools/DumpRenderTree/TestOptions.mm 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Tools/DumpRenderTree/TestOptions.mm 2017-10-26 18:44:08 UTC (rev 224032)
@@ -80,8 +80,6 @@
auto value = pairString.substr(equalsLocation + 1, pairEnd - (equalsLocation + 1));
if (key == "enableAttachmentElement")
this->enableAttachmentElement = parseBooleanTestHeaderValue(value);
- if (key == "useAcceleratedDrawing")
- this->useAcceleratedDrawing = parseBooleanTestHeaderValue(value);
else if (key == "enableIntersectionObserver")
this->enableIntersectionObserver = parseBooleanTestHeaderValue(value);
else if (key == "enableModernMediaControls")
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (224031 => 224032)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-10-26 18:44:08 UTC (rev 224032)
@@ -982,7 +982,6 @@
WebPreferences *preferences = [WebPreferences standardPreferences];
preferences.attachmentElementEnabled = options.enableAttachmentElement;
- preferences.acceleratedDrawingEnabled = options.useAcceleratedDrawing;
preferences.intersectionObserverEnabled = options.enableIntersectionObserver;
preferences.modernMediaControlsEnabled = options.enableModernMediaControls;
preferences.credentialManagementEnabled = options.enableCredentialManagement;
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (224031 => 224032)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-10-26 18:44:08 UTC (rev 224032)
@@ -719,7 +719,7 @@
WKPreferencesSetHiddenPageDOMTimerThrottlingEnabled(preferences, false);
WKPreferencesSetHiddenPageCSSAnimationSuspensionEnabled(preferences, false);
- WKPreferencesSetAcceleratedDrawingEnabled(preferences, m_shouldUseAcceleratedDrawing || options.useAcceleratedDrawing);
+ WKPreferencesSetAcceleratedDrawingEnabled(preferences, m_shouldUseAcceleratedDrawing);
// FIXME: We should be testing the default.
WKPreferencesSetStorageBlockingPolicy(preferences, kWKAllowAllStorage);
@@ -1025,8 +1025,6 @@
String(value.c_str()).split(",", false, testOptions.overrideLanguages);
if (key == "useThreadedScrolling")
testOptions.useThreadedScrolling = parseBooleanTestHeaderValue(value);
- if (key == "useAcceleratedDrawing")
- testOptions.useAcceleratedDrawing = parseBooleanTestHeaderValue(value);
if (key == "useFlexibleViewport")
testOptions.useFlexibleViewport = parseBooleanTestHeaderValue(value);
if (key == "useDataDetection")
Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (224031 => 224032)
--- trunk/Tools/WebKitTestRunner/TestOptions.h 2017-10-26 18:41:35 UTC (rev 224031)
+++ trunk/Tools/WebKitTestRunner/TestOptions.h 2017-10-26 18:44:08 UTC (rev 224032)
@@ -33,7 +33,6 @@
struct TestOptions {
bool useThreadedScrolling { false };
- bool useAcceleratedDrawing { false };
bool useRemoteLayerTree { false };
bool shouldShowWebView { false };
bool useFlexibleViewport { false };
@@ -66,7 +65,6 @@
bool hasSameInitializationOptions(const TestOptions& options) const
{
if (useThreadedScrolling != options.useThreadedScrolling
- || useAcceleratedDrawing != options.useAcceleratedDrawing
|| overrideLanguages != options.overrideLanguages
|| useMockScrollbars != options.useMockScrollbars
|| needsSiteSpecificQuirks != options.needsSiteSpecificQuirks
