Diff
Modified: trunk/LayoutTests/ChangeLog (229087 => 229088)
--- trunk/LayoutTests/ChangeLog 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/LayoutTests/ChangeLog 2018-02-28 07:49:44 UTC (rev 229088)
@@ -1,3 +1,18 @@
+2018-02-27 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r229060.
+ https://bugs.webkit.org/show_bug.cgi?id=183198
+
+ This patch causes crashes on two SVG tests (Requested by fredw
+ on #webkit).
+
+ Reverted changeset:
+
+ "Relayout frames after AsyncFrameScrolling or FrameFlattening
+ option is changed"
+ https://bugs.webkit.org/show_bug.cgi?id=183081
+ https://trac.webkit.org/changeset/229060
+
2018-02-27 Youenn Fablet <[email protected]>
Do not trigger a service worker match in case of document redirection if it will be already served by AppCache
Deleted: trunk/LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic-expected.txt (229087 => 229088)
--- trunk/LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic-expected.txt 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic-expected.txt 2018-02-28 07:49:44 UTC (rev 229088)
@@ -1,8 +0,0 @@
-
-
-PASS Frame flattening fully enabled, async frame scrolling disabled
-PASS Enabling async frame scrolling
-PASS Disabling async frame scrolling
-PASS Disabling frame flattening
-PASS Enabling frame flattening
-
Deleted: trunk/LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html (229087 => 229088)
--- trunk/LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html 2018-02-28 07:49:44 UTC (rev 229088)
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>This tests frame flattening when async frame scrolling and frame flattenning settings are changed dynamically</title>
- <meta charset="utf-8"/>
- <script src=""
- <script src=""
- <script>
- if (window.internals)
- window.internals.settings.setFrameFlattening("FullyEnabled");
-
- setup({explicit_done: true});
- function isUnflatten(id) {
- var iframe = document.getElementById(id);
- var iframeBox = iframe.getBoundingClientRect();
- var innerDivBox = iframe.contentDocument.body.firstElementChild.getBoundingClientRect();
- return iframeBox.width < innerDivBox.width && iframeBox.height < innerDivBox.height;
- }
-
- function frameRelayoutDelay() {
- return new Promise(resolve => {
- setTimeout(resolve, 0);
- });
- }
-
- async function runTest() {
- test(() => { assert_false(isUnflatten("iframe")); },
- "Frame flattening fully enabled, async frame scrolling disabled");
-
- window.internals.settings.setAsyncFrameScrollingEnabled(true);
- await frameRelayoutDelay();
- test(() => { assert_true(isUnflatten("iframe")); },
- "Enabling async frame scrolling");
-
- window.internals.settings.setAsyncFrameScrollingEnabled(false);
- await frameRelayoutDelay();
- test(() => { assert_false(isUnflatten("iframe")); },
- "Disabling async frame scrolling");
-
- window.internals.settings.setFrameFlattening("Disabled");
- await frameRelayoutDelay();
- test(() => { assert_true(isUnflatten("iframe")); },
- "Disabling frame flattening");
-
- window.internals.settings.setFrameFlattening("FullyEnabled");
- await frameRelayoutDelay();
- test(() => { assert_false(isUnflatten("iframe")); },
- "Enabling frame flattening");
-
- done();
- }
- </script>
- </head>
- <body>
- <iframe _onload_="runTest()" id="iframe" style="background: blue; width: 50px; height: 50px;" scrolling="yes" srcdoc="<div style='width: 1000px; height: 1000px;'></div>"></iframe>
- </body>
-</html>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (229087 => 229088)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2018-02-28 07:49:44 UTC (rev 229088)
@@ -4,6 +4,7 @@
#
css3/font-variant-small-caps-synthesis-coverage.html [ ImageOnlyFailure ]
+fast/frames/flattening/scrolling-in-object.html [ ImageOnlyFailure ]
fast/frames/sandboxed-iframe-close-top-noclose.html [ Failure ]
fast/multicol/flexbox-rows.html [ Skip ]
workers/wasm-mem-post-message.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (229087 => 229088)
--- trunk/Source/WebCore/ChangeLog 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/Source/WebCore/ChangeLog 2018-02-28 07:49:44 UTC (rev 229088)
@@ -1,3 +1,18 @@
+2018-02-27 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r229060.
+ https://bugs.webkit.org/show_bug.cgi?id=183198
+
+ This patch causes crashes on two SVG tests (Requested by fredw
+ on #webkit).
+
+ Reverted changeset:
+
+ "Relayout frames after AsyncFrameScrolling or FrameFlattening
+ option is changed"
+ https://bugs.webkit.org/show_bug.cgi?id=183081
+ https://trac.webkit.org/changeset/229060
+
2018-02-27 Youenn Fablet <[email protected]>
Do not trigger a service worker match in case of document redirection if it will be already served by AppCache
Modified: trunk/Source/WebCore/page/Settings.yaml (229087 => 229088)
--- trunk/Source/WebCore/page/Settings.yaml 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/Source/WebCore/page/Settings.yaml 2018-02-28 07:49:44 UTC (rev 229088)
@@ -356,10 +356,8 @@
frameFlattening:
type: FrameFlattening
initial: FrameFlattening::Disabled
- onChange: setNeedsRelayoutAllFrames
asyncFrameScrollingEnabled:
initial: false
- onChange: setNeedsRelayoutAllFrames
webSecurityEnabled:
initial: true
Modified: trunk/Source/WebCore/page/SettingsBase.cpp (229087 => 229088)
--- trunk/Source/WebCore/page/SettingsBase.cpp 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/Source/WebCore/page/SettingsBase.cpp 2018-02-28 07:49:44 UTC (rev 229088)
@@ -41,7 +41,6 @@
#include "MainFrame.h"
#include "Page.h"
#include "PageCache.h"
-#include "RenderWidget.h"
#include "RuntimeApplicationChecks.h"
#include "Settings.h"
#include "StorageMap.h"
@@ -270,22 +269,6 @@
m_page->setNeedsRecalcStyleInAllFrames();
}
-void SettingsBase::setNeedsRelayoutAllFrames()
-{
- if (!m_page)
- return;
-
- for (auto* frame = m_page->mainFrame().tree().traverseNext(); frame; frame = frame->tree().traverseNext()) {
- if (frame->ownerRenderer())
- frame->ownerRenderer()->setNeedsLayoutAndPrefWidthsRecalc();
- }
-
- if (auto* mainDocument = m_page->mainFrame().document()) {
- if (auto* frameView = mainDocument->view())
- frameView->layoutContext().scheduleLayout();
- }
-}
-
void SettingsBase::mediaTypeOverrideChanged()
{
if (!m_page)
Modified: trunk/Source/WebCore/page/SettingsBase.h (229087 => 229088)
--- trunk/Source/WebCore/page/SettingsBase.h 2018-02-28 05:41:18 UTC (rev 229087)
+++ trunk/Source/WebCore/page/SettingsBase.h 2018-02-28 07:49:44 UTC (rev 229088)
@@ -164,7 +164,6 @@
// Helpers used by generated Settings.cpp.
void setNeedsRecalcStyleInAllFrames();
- void setNeedsRelayoutAllFrames();
void mediaTypeOverrideChanged();
void imagesEnabledChanged();
void scriptEnabledChanged();
