Changeset 229361 in webkit

Timestamp:

Mar 7, 2018 9:11:17 AM (6 years ago)

Author:

fred.wang@free.fr

Message:

Relayout frames after AsyncFrameScrolling or FrameFlattening option is changed
​https://bugs.webkit.org/show_bug.cgi?id=183081

Patch by Frederic Wang <​fwang@igalia.com> on 2018-03-07
Reviewed by Antonio Gomes.

Source/WebCore:

The frames may be resized when the FrameFlattening option is modified and hence this patch
forces a relayout. It also does that when AsyncFrameScrolling is modified too, since that
may imply changes in frame flattening after bug 173704. Forcing a relayout will also be
enough to trigger other updates for async frame scrolling in the future (see bug 149264 and
bug 171667).

Test: platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html

• page/Settings.yaml: Call setNeedsRelayoutAllFrames when one of the AsyncFrameScrolling or

FrameFlattening options is changed.

• page/SettingsBase.cpp: Include RenderWidget to make call on frame->ownerRenderer().

(WebCore::SettingsBase::setNeedsRelayoutAllFrames): Make layout and preferred widths dirty
on all frames in the page and schedule a relayout.

• page/SettingsBase.h: Declare setNeedsRelayoutAllFrames().

LayoutTests:

Add a test to check whether an iframe changes its flattening status after one of the option
AsyncFrameScrolling/FrameFlattening is enabled/disabled.

• platform/ios-simulator/TestExpectations: Remove failure for scrolling-in-object.html.
• platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic-expected.txt: Added.
• platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator/TestExpectations (modified) (1 diff)
• LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic-expected.txt (added)
• LayoutTests/platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Settings.yaml (modified) (1 diff)
• Source/WebCore/page/SettingsBase.cpp (modified) (2 diffs)
• Source/WebCore/page/SettingsBase.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-03-07  Frederic Wang  <fwang@igalia.com>
+
+        Relayout frames after AsyncFrameScrolling or FrameFlattening option is changed
+        https://bugs.webkit.org/show_bug.cgi?id=183081
+
+        Reviewed by Antonio Gomes.
+
+        Add a test to check whether an iframe changes its flattening status after one of the option
+        AsyncFrameScrolling/FrameFlattening is enabled/disabled.
+
+        * platform/ios-simulator/TestExpectations: Remove failure for scrolling-in-object.html.
+        * platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic-expected.txt: Added.
+        * platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html: Added.
+
 2018-03-07  Per Arne Vollan  <pvollan@apple.com>
 

trunk/LayoutTests/platform/ios-simulator/TestExpectations

@@ -5 +5 @@
 
 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 ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-07  Frederic Wang  <fwang@igalia.com>
+
+        Relayout frames after AsyncFrameScrolling or FrameFlattening option is changed
+        https://bugs.webkit.org/show_bug.cgi?id=183081
+
+        Reviewed by Antonio Gomes.
+
+        The frames may be resized when the FrameFlattening option is modified and hence this patch
+        forces a relayout. It also does that when AsyncFrameScrolling is modified too, since that
+        may imply changes in frame flattening after bug 173704. Forcing a relayout will also be
+        enough to trigger other updates for async frame scrolling in the future (see bug 149264 and
+        bug 171667).
+
+        Test: platform/ios/fast/frames/flattening/iframe-flattening-async-frame-scrolling-dynamic.html
+
+        * page/Settings.yaml: Call setNeedsRelayoutAllFrames when one of the AsyncFrameScrolling or
+        FrameFlattening options is changed.
+        * page/SettingsBase.cpp: Include RenderWidget to make call on frame->ownerRenderer().
+        (WebCore::SettingsBase::setNeedsRelayoutAllFrames):  Make layout and preferred widths dirty
+        on all frames in the page and schedule a relayout.
+        * page/SettingsBase.h: Declare setNeedsRelayoutAllFrames().
+
 2018-03-07  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebCore/page/Settings.yaml

@@ -357 +357 @@
   type: FrameFlattening
   initial: FrameFlattening::Disabled
+  onChange: setNeedsRelayoutAllFrames
 asyncFrameScrollingEnabled:
   initial: false
+  onChange: setNeedsRelayoutAllFrames
 
 webSecurityEnabled:

trunk/Source/WebCore/page/SettingsBase.cpp

@@ -42 +42 @@
 #include "Page.h"
 #include "PageCache.h"
+#include "RenderWidget.h"
 #include "RuntimeApplicationChecks.h"
 #include "Settings.h"
@@ -268 +269 @@
     if (m_page)
         m_page->setNeedsRecalcStyleInAllFrames();
+}
+
+void SettingsBase::setNeedsRelayoutAllFrames()
+{
+    if (!m_page)
+        return;
+
+    for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+        if (!frame->ownerRenderer())
+            continue;
+        frame->ownerRenderer()->setNeedsLayoutAndPrefWidthsRecalc();
+    }
 }
 

trunk/Source/WebCore/page/SettingsBase.h

@@ -165 +165 @@
     // Helpers used by generated Settings.cpp.
     void setNeedsRecalcStyleInAllFrames();
+    void setNeedsRelayoutAllFrames();
     void mediaTypeOverrideChanged();
     void imagesEnabledChanged();