Changeset 235735 in webkit

Timestamp:

Sep 6, 2018, 6:40:56 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC] Adapt to the new const WeakPtr<>
​https://bugs.webkit.org/show_bug.cgi?id=189334

Reviewed by Antti Koivisto.

• layout/FormattingContext.cpp:

(WebCore::Layout::FormattingContext::FormattingContext):

• layout/FormattingContext.h:
• layout/LayoutContext.cpp:

(WebCore::Layout::LayoutContext::initializeRoot):

• layout/LayoutContext.h:
• layout/floats/FloatAvoider.cpp:

(WebCore::Layout::FloatAvoider::FloatAvoider):

• layout/floats/FloatAvoider.h:
• layout/floats/FloatingState.cpp:

(WebCore::Layout::FloatingState::FloatItem::FloatItem):
(WebCore::Layout::FloatingState::FloatingState):

• layout/floats/FloatingState.h:
• layout/layouttree/LayoutContainer.cpp:

(WebCore::Layout::Container::addOutOfFlowDescendant):

• layout/layouttree/LayoutContainer.h:

(WebCore::Layout::Container::outOfFlowDescendants const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContext.cpp (modified) (1 diff)
• layout/FormattingContext.h (modified) (1 diff)
• layout/LayoutContext.cpp (modified) (1 diff)
• layout/LayoutContext.h (modified) (1 diff)
• layout/floats/FloatAvoider.cpp (modified) (1 diff)
• layout/floats/FloatAvoider.h (modified) (1 diff)
• layout/floats/FloatingState.cpp (modified) (2 diffs)
• layout/floats/FloatingState.h (modified) (2 diffs)
• layout/layouttree/LayoutContainer.cpp (modified) (1 diff)
• layout/layouttree/LayoutContainer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-05  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Adapt to the new const WeakPtr<>
+        https://bugs.webkit.org/show_bug.cgi?id=189334
+
+        Reviewed by Antti Koivisto.
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::FormattingContext):
+        * layout/FormattingContext.h:
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::initializeRoot):
+        * layout/LayoutContext.h:
+        * layout/floats/FloatAvoider.cpp:
+        (WebCore::Layout::FloatAvoider::FloatAvoider):
+        * layout/floats/FloatAvoider.h:
+        * layout/floats/FloatingState.cpp:
+        (WebCore::Layout::FloatingState::FloatItem::FloatItem):
+        (WebCore::Layout::FloatingState::FloatingState):
+        * layout/floats/FloatingState.h:
+        * layout/layouttree/LayoutContainer.cpp:
+        (WebCore::Layout::Container::addOutOfFlowDescendant):
+        * layout/layouttree/LayoutContainer.h:
+        (WebCore::Layout::Container::outOfFlowDescendants const):
+
 2018-09-06  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/WebCore/layout/FormattingContext.cpp

@@ -44 +44 @@
 
 FormattingContext::FormattingContext(const Box& formattingContextRoot)
-    : m_root(makeWeakPtr(const_cast<Box&>(formattingContextRoot)))
+    : m_root(makeWeakPtr(formattingContextRoot))
 {
 }

trunk/Source/WebCore/layout/FormattingContext.h

@@ -123 +123 @@
     void computeOutOfFlowHorizontalGeometry(LayoutContext&, const Box&) const;
 
-    WeakPtr<Box> m_root;
+    WeakPtr<const Box> m_root;
 };
 

trunk/Source/WebCore/layout/LayoutContext.cpp

@@ -54 +54 @@
     ASSERT(root.establishesFormattingContext());
 
-    m_root = makeWeakPtr(const_cast<Container&>(root));
+    m_root = makeWeakPtr(root);
     auto& displayBox = displayBoxForLayoutBox(root);
 

trunk/Source/WebCore/layout/LayoutContext.h

@@ -91 +91 @@
     void layoutFormattingContextSubtree(const Box&);
 
-    WeakPtr<Container> m_root;
+    WeakPtr<const Container> m_root;
     HashSet<const Container*> m_formattingContextRootListForLayout;
     HashMap<const Box*, std::unique_ptr<FormattingState>> m_formattingStates;

trunk/Source/WebCore/layout/floats/FloatAvoider.cpp

@@ -40 +40 @@
 
 FloatAvoider::FloatAvoider(const Box& layoutBox, const FloatingState& floatingState, const LayoutContext& layoutContext)
-    : m_layoutBox(makeWeakPtr(const_cast<Box&>(layoutBox)))
+    : m_layoutBox(makeWeakPtr(layoutBox))
     , m_floatingState(floatingState)
     , m_absoluteDisplayBox(FormattingContext::mapBoxToAncestor(layoutContext, layoutBox, downcast<Container>(floatingState.root())))

trunk/Source/WebCore/layout/floats/FloatAvoider.h

@@ -83 +83 @@
 
 private:
-    WeakPtr<Box> m_layoutBox;
+    WeakPtr<const Box> m_layoutBox;
     const FloatingState& m_floatingState;
     Display::Box m_absoluteDisplayBox;

trunk/Source/WebCore/layout/floats/FloatingState.cpp

@@ -41 +41 @@
 
 FloatingState::FloatItem::FloatItem(const Box& layoutBox, const FloatingState& floatingState)
-    : m_layoutBox(makeWeakPtr(const_cast<Box&>(layoutBox)))
+    : m_layoutBox(makeWeakPtr(layoutBox))
     , m_absoluteDisplayBox(FormattingContext::mapBoxToAncestor(floatingState.layoutContext(), layoutBox, downcast<Container>(floatingState.root())))
 {
@@ -48 +48 @@
 FloatingState::FloatingState(LayoutContext& layoutContext, const Box& formattingContextRoot)
     : m_layoutContext(layoutContext)
-    , m_formattingContextRoot(makeWeakPtr(const_cast<Box&>(formattingContextRoot)))
+    , m_formattingContextRoot(makeWeakPtr(formattingContextRoot))
 {
 }

trunk/Source/WebCore/layout/floats/FloatingState.h

@@ -72 +72 @@
 
     private:
-        WeakPtr<Box> m_layoutBox;
+        WeakPtr<const Box> m_layoutBox;
         Display::Box m_absoluteDisplayBox;
     };
@@ -88 +88 @@
 
     LayoutContext& m_layoutContext;
-    WeakPtr<Box> m_formattingContextRoot;
+    WeakPtr<const Box> m_formattingContextRoot;
     FloatList m_floats;
 };

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

@@ -97 +97 @@
     // it's okay to store them at the formatting context root level -as opposed to the containing block level.
     ASSERT(establishesFormattingContext());
-    m_outOfFlowDescendants.append(makeWeakPtr(const_cast<Box&>(outOfFlowBox)));
+    m_outOfFlowDescendants.append(makeWeakPtr(outOfFlowBox));
 }
 

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

@@ -54 +54 @@
     bool hasInFlowOrFloatingChild() const { return firstInFlowOrFloatingChild(); }
 
-    const Vector<WeakPtr<Box>>& outOfFlowDescendants() const { return m_outOfFlowDescendants; }
+    const Vector<WeakPtr<const Box>>& outOfFlowDescendants() const { return m_outOfFlowDescendants; }
 
 protected:
@@ -66 +66 @@
     Box* m_firstChild { nullptr };
     Box* m_lastChild { nullptr };
-    Vector<WeakPtr<Box>> m_outOfFlowDescendants;
+    Vector<WeakPtr<const Box>> m_outOfFlowDescendants;
 };