Changeset 232876 in webkit

Timestamp:

Jun 15, 2018 9:26:23 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC] Fix static position left/top
​https://bugs.webkit.org/show_bug.cgi?id=186640

Reviewed by Antti Koivisto.

In visual formatting model, we normally go like [top, left] while LayoutPoint takes [x, y]. Let's make this less error prone.

• layout/FormattingContext.h:

(WebCore::Layout::FormattingContext::Geometry::Position::operator LayoutPoint const):

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

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContext.h (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.h (modified) (1 diff)
• layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-06-15  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Fix static position left/top
+        https://bugs.webkit.org/show_bug.cgi?id=186640
+
+        Reviewed by Antti Koivisto.
+
+        In visual formatting model, we normally go like [top, left] while LayoutPoint takes [x, y]. Let's make this less error prone.
+
+        * layout/FormattingContext.h:
+        (WebCore::Layout::FormattingContext::Geometry::Position::operator LayoutPoint const):
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::staticPosition):
+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowPositionedPosition):
+
 2018-06-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/layout/FormattingContext.h

@@ -82 +82 @@
     class Geometry {
     public:
+        struct Position {
+            // FIXME: Use LayoutUnit<Horizontal> to avoid top/left vs. x/y confusion.
+            LayoutUnit x; // left
+            LayoutUnit y; // top
+            operator LayoutPoint() const { return { x, y }; }
+        };
+
         struct WidthAndMargin {
             LayoutUnit width;

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

@@ -66 +66 @@
         static FormattingContext::Geometry::WidthAndMargin inFlowWidthAndMargin(LayoutContext&, const Box&);
 
-        static LayoutPoint staticPosition(LayoutContext&, const Box&);
-        static LayoutPoint inFlowPositionedPosition(LayoutContext&, const Box&);
+        static FormattingContext::Geometry::Position staticPosition(LayoutContext&, const Box&);
+        static FormattingContext::Geometry::Position inFlowPositionedPosition(LayoutContext&, const Box&);
 
     private:

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

@@ -263 +263 @@
 }
 
-LayoutPoint BlockFormattingContext::Geometry::staticPosition(LayoutContext& layoutContext, const Box& layoutBox)
+FormattingContext::Geometry::Position BlockFormattingContext::Geometry::staticPosition(LayoutContext& layoutContext, const Box& layoutBox)
 {
     // https://www.w3.org/TR/CSS22/visuren.html#block-formatting
@@ -280 +280 @@
     }
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[Position] -> static -> top(" << top << "px) left(" << left << "px) layoutBox(" << &layoutBox << ")");
-    return { top, left };
-}
-
-LayoutPoint BlockFormattingContext::Geometry::inFlowPositionedPosition(LayoutContext& layoutContext, const Box& layoutBox)
+    return { left, top };
+}
+
+FormattingContext::Geometry::Position BlockFormattingContext::Geometry::inFlowPositionedPosition(LayoutContext& layoutContext, const Box& layoutBox)
 {
     ASSERT(layoutBox.isInFlowPositioned());
@@ -358 +358 @@
 
     LOG_WITH_STREAM(FormattingContextLayout, stream << "[Position] -> positioned inflow -> top(" << newTopPosition << "px) left(" << newLeftPosition << "px) layoutBox(" << &layoutBox << ")");
-    return { newTopPosition, newLeftPosition };
+    return { newLeftPosition, newTopPosition };
 }