Changeset 238480 in webkit

Timestamp:

Nov 25, 2018, 1:30:34 PM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC] Floating code should use typed positions (PositionInContextRoot).
​https://bugs.webkit.org/show_bug.cgi?id=191949

Reviewed by Antti Koivisto.

Use PositionInContextRoot instead of LayoutUnit.

• layout/floats/FloatingState.cpp:

(WebCore::Layout::FloatingState::constraints const):
(WebCore::Layout::FloatingState::bottom const):

• layout/floats/FloatingState.h:

(WebCore::Layout::FloatingState::leftBottom const):
(WebCore::Layout::FloatingState::rightBottom const):
(WebCore::Layout::FloatingState::bottom const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/floats/FloatingState.cpp (modified) (3 diffs)
• layout/floats/FloatingState.h (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Floating code should use typed positions (PositionInContextRoot).
+        https://bugs.webkit.org/show_bug.cgi?id=191949
+
+        Reviewed by Antti Koivisto.
+
+        Use PositionInContextRoot instead of LayoutUnit.
+
+        * layout/floats/FloatingState.cpp:
+        (WebCore::Layout::FloatingState::constraints const):
+        (WebCore::Layout::FloatingState::bottom const):
+        * layout/floats/FloatingState.h:
+        (WebCore::Layout::FloatingState::leftBottom const):
+        (WebCore::Layout::FloatingState::rightBottom const):
+        (WebCore::Layout::FloatingState::bottom const):
+
 2018-11-25  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -87 +87 @@
 }
 
-FloatingState::Constraints FloatingState::constraints(LayoutUnit verticalPosition, const Box& formattingContextRoot) const
+FloatingState::Constraints FloatingState::constraints(PositionInContextRoot verticalPosition, const Box& formattingContextRoot) const
 {
     if (isEmpty())
@@ -135 +135 @@
 }
 
-std::optional<LayoutUnit> FloatingState::bottom(const Box& formattingContextRoot, Clear type) const
+std::optional<PositionInContextRoot> FloatingState::bottom(const Box& formattingContextRoot, Clear type) const
 {
     if (m_floats.isEmpty())
@@ -142 +142 @@
     // TODO: Currently this is only called once for each formatting context root with floats per layout.
     // Cache the value if we end up calling it more frequently (and update it at append/remove).
-    std::optional<LayoutUnit> bottom;
+    std::optional<PositionInContextRoot> bottom;
     for (auto& floatItem : m_floats) {
         // Ignore floats from other formatting contexts when the floating state is inherited.

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

@@ -55 +55 @@
     const Box& root() const { return *m_formattingContextRoot; }
 
-    std::optional<LayoutUnit> leftBottom(const Box& formattingContextRoot) const;
-    std::optional<LayoutUnit> rightBottom(const Box& formattingContextRoot) const;
-    std::optional<LayoutUnit> bottom(const Box& formattingContextRoot) const;
+    std::optional<PositionInContextRoot> leftBottom(const Box& formattingContextRoot) const;
+    std::optional<PositionInContextRoot> rightBottom(const Box& formattingContextRoot) const;
+    std::optional<PositionInContextRoot> bottom(const Box& formattingContextRoot) const;
 
     struct Constraints {
-        std::optional<LayoutUnit> left;
-        std::optional<LayoutUnit> right;
+        std::optional<PositionInContextRoot> left;
+        std::optional<PositionInContextRoot> right;
     };
-    Constraints constraints(LayoutUnit verticalPosition, const Box& formattingContextRoot) const;
+    Constraints constraints(PositionInContextRoot verticalPosition, const Box& formattingContextRoot) const;
 
     class FloatItem {
@@ -91 +91 @@
     LayoutState& layoutState() const { return m_layoutState; }
 
-    std::optional<LayoutUnit> bottom(const Box& formattingContextRoot, Clear) const;
+    std::optional<PositionInContextRoot> bottom(const Box& formattingContextRoot, Clear) const;
 
     LayoutState& m_layoutState;
@@ -98 +98 @@
 };
 
-inline std::optional<LayoutUnit> FloatingState::leftBottom(const Box& formattingContextRoot) const
+inline std::optional<PositionInContextRoot> FloatingState::leftBottom(const Box& formattingContextRoot) const
 { 
     ASSERT(formattingContextRoot.establishesFormattingContext());
@@ -104 +104 @@
 }
 
-inline std::optional<LayoutUnit> FloatingState::rightBottom(const Box& formattingContextRoot) const
+inline std::optional<PositionInContextRoot> FloatingState::rightBottom(const Box& formattingContextRoot) const
 {
     ASSERT(formattingContextRoot.establishesFormattingContext());
@@ -110 +110 @@
 }
 
-inline std::optional<LayoutUnit> FloatingState::bottom(const Box& formattingContextRoot) const
+inline std::optional<PositionInContextRoot> FloatingState::bottom(const Box& formattingContextRoot) const
 {
     ASSERT(formattingContextRoot.establishesFormattingContext());