Changeset 250776 in webkit

Timestamp:

Oct 7, 2019 10:28:28 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC] Add const version of LayoutState::displayBoxForLayoutBox
​https://bugs.webkit.org/show_bug.cgi?id=202623
<rdar://problem/56025259>

Reviewed by Antti Koivisto.

• layout/LayoutState.cpp:

(WebCore::Layout::LayoutState::displayBoxForLayoutBox):
(WebCore::Layout::LayoutState::displayBoxForLayoutBox const):

• layout/LayoutState.h:
• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::outputLayoutTree):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutState.cpp (modified) (1 diff)
• layout/LayoutState.h (modified) (2 diffs)
• layout/layouttree/LayoutTreeBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-07  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Add const version of LayoutState::displayBoxForLayoutBox
+        https://bugs.webkit.org/show_bug.cgi?id=202623
+        <rdar://problem/56025259>
+
+        Reviewed by Antti Koivisto.
+
+        * layout/LayoutState.cpp:
+        (WebCore::Layout::LayoutState::displayBoxForLayoutBox):
+        (WebCore::Layout::LayoutState::displayBoxForLayoutBox const):
+        * layout/LayoutState.h:
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::outputLayoutTree):
+
 2019-10-07  youenn fablet  <youenn@apple.com>
 

trunk/Source/WebCore/layout/LayoutState.cpp

@@ -46 +46 @@
 }
 
-Display::Box& LayoutState::displayBoxForLayoutBox(const Box& layoutBox) const
+Display::Box& LayoutState::displayBoxForLayoutBox(const Box& layoutBox)
 {
     return *m_layoutToDisplayBox.ensure(&layoutBox, [&layoutBox] {
         return makeUnique<Display::Box>(layoutBox.style());
     }).iterator->value;
+}
+
+const Display::Box& LayoutState::displayBoxForLayoutBox(const Box& layoutBox) const
+{
+    ASSERT(hasDisplayBox(layoutBox));
+    return *m_layoutToDisplayBox.get(&layoutBox);
 }
 

trunk/Source/WebCore/layout/LayoutState.h

@@ -61 +61 @@
 #endif
 
-    Display::Box& displayBoxForLayoutBox(const Box& layoutBox) const;
+    Display::Box& displayBoxForLayoutBox(const Box& layoutBox);
+    const Display::Box& displayBoxForLayoutBox(const Box& layoutBox) const;
     bool hasDisplayBox(const Box& layoutBox) const { return m_layoutToDisplayBox.contains(&layoutBox); }
 
@@ -78 +79 @@
     HashSet<const FormattingContext*> m_formattingContextList;
 #endif
-    mutable HashMap<const Box*, std::unique_ptr<Display::Box>> m_layoutToDisplayBox;
+    HashMap<const Box*, std::unique_ptr<Display::Box>> m_layoutToDisplayBox;
     QuirksMode m_quirksMode { QuirksMode::No };
 };

trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

@@ -327 +327 @@
 {
     for (auto& child : childrenOfType<Box>(rootContainer)) {
-        Display::Box* displayBox = nullptr;
-        // Not all boxes generate display boxes.
-        if (layoutState && layoutState->hasDisplayBox(child))
-            displayBox = &layoutState->displayBoxForLayoutBox(child);
-
-        outputLayoutBox(stream, child, displayBox, depth);
-        if (layoutState && child.establishesInlineFormattingContext())
-            outputInlineRuns(stream, *layoutState, downcast<Container>(child), depth + 1);
+        if (layoutState) {
+            // Not all boxes generate display boxes.
+            if (layoutState->hasDisplayBox(child))
+                outputLayoutBox(stream, child, &layoutState->displayBoxForLayoutBox(child), depth);
+            if (child.establishesInlineFormattingContext())
+                outputInlineRuns(stream, *layoutState, downcast<Container>(child), depth + 1);
+        } else
+            outputLayoutBox(stream, child, nullptr, depth);
 
         if (is<Container>(child))