Changeset 238481 in webkit

Timestamp:

Nov 25, 2018 1:32:55 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC] Rename Layout::Position to Layout::Point
​https://bugs.webkit.org/show_bug.cgi?id=191950

Reviewed by Antti Koivisto.

It actually represents a point.

• layout/FormattingContext.cpp:

(WebCore::Layout::FormattingContext::mapTopLeftToAncestor):
(WebCore::Layout::FormattingContext::mapCoordinateToAncestor):

• layout/FormattingContext.h:
• layout/LayoutUnits.h:

(WebCore::Layout::Point::Point):
(WebCore::Layout::Point::moveBy):
(WebCore::Layout::Position::operator LayoutPoint const): Deleted.
(WebCore::Layout::Position::Position): Deleted.
(WebCore::Layout::Position::moveBy): Deleted.

• layout/blockformatting/BlockFormattingContext.h:
• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::staticPosition):

• layout/floats/FloatingState.cpp:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContext.cpp (modified) (2 diffs)
• layout/FormattingContext.h (modified) (1 diff)
• layout/LayoutUnits.h (modified) (4 diffs)
• layout/blockformatting/BlockFormattingContext.h (modified) (2 diffs)
• layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (1 diff)
• layout/floats/FloatingState.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Rename Layout::Position to Layout::Point
+        https://bugs.webkit.org/show_bug.cgi?id=191950
+
+        Reviewed by Antti Koivisto.
+
+        It actually represents a point.
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::mapTopLeftToAncestor):
+        (WebCore::Layout::FormattingContext::mapCoordinateToAncestor):
+        * layout/FormattingContext.h:
+        * layout/LayoutUnits.h:
+        (WebCore::Layout::Point::Point):
+        (WebCore::Layout::Point::moveBy):
+        (WebCore::Layout::Position::operator LayoutPoint const): Deleted.
+        (WebCore::Layout::Position::Position): Deleted.
+        (WebCore::Layout::Position::moveBy): Deleted.
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::staticPosition):
+        * layout/floats/FloatingState.cpp:
+        (WebCore::Layout::FloatingState::constraints const):
+
 2018-11-25  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/FormattingContext.cpp

@@ -184 +184 @@
 }
 
-Position FormattingContext::mapTopLeftToAncestor(const LayoutState& layoutState, const Box& layoutBox, const Container& ancestor)
+Point FormattingContext::mapTopLeftToAncestor(const LayoutState& layoutState, const Box& layoutBox, const Container& ancestor)
 {
     ASSERT(layoutBox.isDescendantOf(ancestor));
@@ -190 +190 @@
 }
 
-Position FormattingContext::mapCoordinateToAncestor(const LayoutState& layoutState, Position position, const Container& containingBlock, const Container& ancestor)
+Point FormattingContext::mapCoordinateToAncestor(const LayoutState& layoutState, Point position, const Container& containingBlock, const Container& ancestor)
 {
     auto mappedPosition = position;

trunk/Source/WebCore/layout/FormattingContext.h

@@ -60 +60 @@
 
     static Display::Box mapBoxToAncestor(const LayoutState&, const Box&, const Container& ancestor);
-    static Position mapTopLeftToAncestor(const LayoutState&, const Box&, const Container& ancestor);
-    static Position mapCoordinateToAncestor(const LayoutState&, Position, const Container& containingBlock, const Container& ancestor);
+    static Point mapTopLeftToAncestor(const LayoutState&, const Box&, const Container& ancestor);
+    static Point mapCoordinateToAncestor(const LayoutState&, Point, const Container& containingBlock, const Container& ancestor);
 
 protected:

trunk/Source/WebCore/layout/LayoutUnits.h

@@ -35 +35 @@
 namespace Layout {
 
-struct Position {
+struct Point {
     // FIXME: Use LayoutUnit<Horizontal> to avoid top/left vs. x/y confusion.
     LayoutUnit x; // left
     LayoutUnit y; // top
 
-    Position() = default;
-    Position(LayoutUnit, LayoutUnit);
-    Position(LayoutPoint);
+    Point() = default;
+    Point(LayoutUnit, LayoutUnit);
+    Point(LayoutPoint);
     void moveBy(LayoutPoint);
     operator LayoutPoint() const { return { x, y }; }
@@ -48 +48 @@
 
 // FIXME: Wrap these into structs.
-using PointInContextRoot = Position;
-using PointInContainingBlock = Position;
+using PointInContextRoot = Point;
+using PointInContainingBlock = Point;
 using PositionInContextRoot = LayoutUnit;
 using PositionInContainingBlock = LayoutUnit;
 
-inline Position::Position(LayoutPoint point)
+inline Point::Point(LayoutPoint point)
     : x(point.x())
     , y(point.y())
@@ -59 +59 @@
 }
 
-inline Position::Position(LayoutUnit x, LayoutUnit y)
+inline Point::Point(LayoutUnit x, LayoutUnit y)
     : x(x)
     , y(y)
@@ -65 +65 @@
 }
 
-inline void Position::moveBy(LayoutPoint offset)
+inline void Point::moveBy(LayoutPoint offset)
 {
     x += offset.x();

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h

@@ -75 +75 @@
         static WidthAndMargin inFlowWidthAndMargin(const LayoutState&, const Box&, std::optional<LayoutUnit> usedWidth = { });
 
-        static Position staticPosition(const LayoutState&, const Box&);
+        static Point staticPosition(const LayoutState&, const Box&);
 
         static bool instrinsicWidthConstraintsNeedChildrenWidth(const Box&);
@@ -106 +106 @@
         static WidthAndMargin inFlowNonReplacedWidthAndMargin(const LayoutState&, const Box&, std::optional<LayoutUnit> usedWidth = { });
         static WidthAndMargin inFlowReplacedWidthAndMargin(const LayoutState&, const Box&, std::optional<LayoutUnit> usedWidth = { });
-        static Position staticPositionForOutOfFlowPositioned(const LayoutState&, const Box&);
+        static Point staticPositionForOutOfFlowPositioned(const LayoutState&, const Box&);
     };
 };

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp

@@ -267 +267 @@
 }
 
-Position BlockFormattingContext::Geometry::staticPosition(const LayoutState& layoutState, const Box& layoutBox)
+Point BlockFormattingContext::Geometry::staticPosition(const LayoutState& layoutState, const Box& layoutBox)
 {
     // https://www.w3.org/TR/CSS22/visuren.html#block-formatting

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

@@ -96 +96 @@
     // 3. Convert left/right positions back to formattingContextRoot's cooridnate system.
     auto coordinateMappingIsRequired = &root() != &formattingContextRoot;
-    auto adjustedPosition = Position { 0, verticalPosition };
+    auto adjustedPosition = Point { 0, verticalPosition };
 
     if (coordinateMappingIsRequired)