Changeset 254378 in webkit

Timestamp:

Jan 10, 2020 4:13:12 PM (4 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Update style for layout boxes
​https://bugs.webkit.org/show_bug.cgi?id=206074

Reviewed by Zalan Bujtas.

Source/WebCore:

Test: fast/css/simple-color-change.html

For simple style changes we may keep the existing layout boxes. In this case we need to update the style.

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::updateStyle):

Update style in layout boxes.

(WebCore::LayoutIntegration::LineLayout::rootLayoutBox):

• layout/integration/LayoutIntegrationLineLayout.h:

Make root non-const.

• layout/layouttree/LayoutBox.h:

(WebCore::Layout::Box::nextSibling):

• layout/layouttree/LayoutContainer.h:

Expose non-const accessors.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::styleDidChange):

Invoke LineLayout::updateStyle

LayoutTests:

• fast/css/simple-color-change-expected.html: Added.
• fast/css/simple-color-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/simple-color-change-expected.html (added)
• LayoutTests/fast/css/simple-color-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (modified) (2 diffs)
• Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h (modified) (2 diffs)
• Source/WebCore/layout/layouttree/LayoutBox.h (modified) (1 diff)
• Source/WebCore/layout/layouttree/LayoutContainer.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-01-10  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Update style for layout boxes
+        https://bugs.webkit.org/show_bug.cgi?id=206074
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/css/simple-color-change-expected.html: Added.
+        * fast/css/simple-color-change.html: Added.
+
 2020-01-10  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-10  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Update style for layout boxes
+        https://bugs.webkit.org/show_bug.cgi?id=206074
+
+        Reviewed by Zalan Bujtas.
+
+        Test: fast/css/simple-color-change.html
+
+        For simple style changes we may keep the existing layout boxes. In this case we need to update the style.
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::updateStyle):
+
+        Update style in layout boxes.
+
+        (WebCore::LayoutIntegration::LineLayout::rootLayoutBox):
+        * layout/integration/LayoutIntegrationLineLayout.h:
+
+        Make root non-const.
+
+        * layout/layouttree/LayoutBox.h:
+        (WebCore::Layout::Box::nextSibling):
+        * layout/layouttree/LayoutContainer.h:
+
+        Expose non-const accessors.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::styleDidChange):
+
+        Invoke LineLayout::updateStyle
+
 2020-01-10  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -77 +77 @@
 }
 
+void LineLayout::updateStyle()
+{
+    auto& root = rootLayoutBox();
+
+    // FIXME: Encapsulate style updates better.
+    root.updateStyle(m_flow.style());
+
+    for (auto* child = root.firstChild(); child; child = child->nextSibling()) {
+        if (child->isAnonymous())
+            child->updateStyle(RenderStyle::createAnonymousStyleWithDisplay(root.style(), DisplayType::Inline));
+    }
+}
+
 void LineLayout::layout()
 {
@@ -200 +213 @@
 }
 
+Layout::Container& LineLayout::rootLayoutBox()
+{
+    return m_treeContent->rootLayoutBox();
+}
+
 void LineLayout::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h

@@ -61 +61 @@
     static bool canUseFor(const RenderBlockFlow&);
 
+    void updateStyle();
     void layout();
 
@@ -81 +82 @@
 private:
     const Layout::Container& rootLayoutBox() const;
+    Layout::Container& rootLayoutBox();
     void prepareRootGeometryForLayout();
     ShadowData* debugTextShadow();
 
     const RenderBlockFlow& m_flow;
-    std::unique_ptr<const Layout::LayoutTreeContent> m_treeContent;
+    std::unique_ptr<Layout::LayoutTreeContent> m_treeContent;
     std::unique_ptr<Layout::LayoutState> m_layoutState;
     LayoutUnit m_contentLogicalHeight;

trunk/Source/WebCore/layout/layouttree/LayoutBox.h

@@ -131 +131 @@
     const Box* previousInFlowOrFloatingSibling() const;
 
+    // FIXME: This is currently needed for style updates.
+    Box* nextSibling() { return m_nextSibling; }
+
     bool isContainer() const { return m_baseTypeFlags & ContainerFlag; }
     bool isBlockContainer() const { return isBlockLevelBox() && isContainer(); }

trunk/Source/WebCore/layout/layouttree/LayoutContainer.h

@@ -49 +49 @@
     const Box* lastInFlowOrFloatingChild() const;
 
+    // FIXME: This is currently needed for style updates.
+    Box* firstChild() { return m_firstChild; }
+
     bool hasChild() const { return firstChild(); }
     bool hasInFlowChild() const { return firstInFlowChild(); }

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -2105 +2105 @@
     if (multiColumnFlow())
         updateStylesForColumnChildren();
+
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+    if (layoutFormattingContextLineLayout())
+        layoutFormattingContextLineLayout()->updateStyle();
+#endif
 }