[LayoutReloaded] Remove all FormattingContext::absolute*Box functions.

https://bugs.webkit.org/show_bug.cgi?id=184215

Reviewed by Antti Koivisto.

Use Display.Box instead.

* LayoutReloaded/FormattingContext/BlockFormatting/BlockFormattingContext.js:
(BlockFormattingContext.prototype._computeOutOfFlowPosition):
* LayoutReloaded/FormattingContext/FloatingContext.js:
(FloatingContext.prototype._availableSpace):
(FloatingContext.prototype._adjustedFloatingPosition):
(FloatingContext.prototype._mapBorderBoxToFormattingRoot):
(FloatingContext.prototype._mapContentBoxToFormattingRoot):
* LayoutReloaded/FormattingContext/FormattingContext.js:
(FormattingContext.prototype.absoluteBorderBox): Deleted.
(FormattingContext.prototype.absolutePaddingBox): Deleted.
(FormattingContext.prototype.absoluteContentBox): Deleted.
(FormattingContext.prototype._toAbsolutePosition): Deleted.
(FormattingContext.prototype._toRootAbsolutePosition): Deleted.
* LayoutReloaded/Utils.js:
(Utils.mapPosition):
(Utils.marginBox):
(Utils.borderBox):
(Utils.contentBox):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230137 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 39e16c541ee83b6fba3be4df3ead603495786267..edd0014da161ab3d3ea603f96dd8b5851f8d6d37 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,31 @@
+2018-03-31  Zalan Bujtas  <zalan@apple.com>
+
+        [LayoutReloaded] Remove all FormattingContext::absolute*Box functions.
+        https://bugs.webkit.org/show_bug.cgi?id=184215
+
+        Reviewed by Antti Koivisto.
+
+        Use Display.Box instead.
+
+        * LayoutReloaded/FormattingContext/BlockFormatting/BlockFormattingContext.js:
+        (BlockFormattingContext.prototype._computeOutOfFlowPosition):
+        * LayoutReloaded/FormattingContext/FloatingContext.js:
+        (FloatingContext.prototype._availableSpace):
+        (FloatingContext.prototype._adjustedFloatingPosition):
+        (FloatingContext.prototype._mapBorderBoxToFormattingRoot):
+        (FloatingContext.prototype._mapContentBoxToFormattingRoot):
+        * LayoutReloaded/FormattingContext/FormattingContext.js:
+        (FormattingContext.prototype.absoluteBorderBox): Deleted.
+        (FormattingContext.prototype.absolutePaddingBox): Deleted.
+        (FormattingContext.prototype.absoluteContentBox): Deleted.
+        (FormattingContext.prototype._toAbsolutePosition): Deleted.
+        (FormattingContext.prototype._toRootAbsolutePosition): Deleted.
+        * LayoutReloaded/Utils.js:
+        (Utils.mapPosition):
+        (Utils.marginBox):
+        (Utils.borderBox):
+        (Utils.contentBox):
+
 2018-03-31  Zalan Bujtas  <zalan@apple.com>
 
         [LayoutReloaded] Remove FormattingContext::absoluteMarginBox

diff --git a/Tools/LayoutReloaded/FormattingContext/BlockFormatting/BlockFormattingContext.js b/Tools/LayoutReloaded/FormattingContext/BlockFormatting/BlockFormattingContext.js
index 4be06888d42c0b8c16d67c6a84762e4be354d8eb..963ae918f4adcec6b1f879be91b5c4cf605a0cb3 100644 (file)
--- a/Tools/LayoutReloaded/FormattingContext/BlockFormatting/BlockFormattingContext.js
+++ b/Tools/LayoutReloaded/FormattingContext/BlockFormatting/BlockFormattingContext.js
@@ -321,8 +321,10 @@ class BlockFormattingContext extends FormattingContext {
             let contentBottom = previousInFlowSibling ? this.displayBox(previousInFlowSibling).bottom() : parentDisplayBox.contentBox().top();
             top = contentBottom + this.marginTop(layoutBox);
             // Convert static position (in parent coordinate system) to absolute (in containing block coordindate system).
-            if (parent != layoutBox.containingBlock())
-                top += this._toAbsolutePosition(parentDisplayBox.topLeft(), parent, layoutBox.containingBlock()).top();
+            if (parent != layoutBox.containingBlock()) {
+                ASSERT(displayBox.parent() == this.displayBox(layoutBox.containingBlock()));
+                top += Utils.mapPosition(parentDisplayBox.topLeft(), parentDisplayBox, displayBox.parent()).top();
+            }
         } else if (!Utils.isTopAuto(layoutBox))
             top = Utils.top(layoutBox) + this.marginTop(layoutBox);
         else if (!Utils.isBottomAuto(layoutBox))
@@ -339,8 +341,10 @@ class BlockFormattingContext extends FormattingContext {
             let parentDisplayBox = this.displayBox(parent);
             left = parentDisplayBox.contentBox().left() + this.marginLeft(layoutBox);
             // Convert static position (in parent coordinate system) to absolute (in containing block coordindate system).
-            if (parent != layoutBox.containingBlock())
-                left += this._toAbsolutePosition(parentDisplayBox.rect(), parent, layoutBox.containingBlock()).left();
+            if (parent != layoutBox.containingBlock()) {
+                ASSERT(displayBox.parent() == this.displayBox(layoutBox.containingBlock()));
+                left += Utils.mapPosition(parentDisplayBox.topLeft(), parentDisplayBox, displayBox.parent()).left();
+            }
         } else if (!Utils.isLeftAuto(layoutBox))
             left = Utils.left(layoutBox) + this.marginLeft(layoutBox);
         else if (!Utils.isRightAuto(layoutBox))

diff --git a/Tools/LayoutReloaded/FormattingContext/FloatingContext.js b/Tools/LayoutReloaded/FormattingContext/FloatingContext.js
index ea26abc88327a97bc298e2cbd84f6602e0a4d554..d7f41f487a17b1e64300f5228924f54210a9b220 100644 (file)
--- a/Tools/LayoutReloaded/FormattingContext/FloatingContext.js
+++ b/Tools/LayoutReloaded/FormattingContext/FloatingContext.js
@@ -127,7 +127,7 @@ class FloatingContext {
         if (floatingPair.left && floatingPair.right)
             return floatingPair.right.left() - floatingPair.left.right();
         if (floatingPair.left)
-            return containingBlockContentBox.width() - (floatingPair.left.right() - this._formattingContext().absoluteBorderBox(containingBlock).left());
+            return containingBlockContentBox.width() - (floatingPair.left.right() - this._mapBorderBoxToFormattingRoot(containingBlock).left());
         if (floatingPair.right)
             return floatingPair.right.left();
         return containingBlockContentBox.width();
@@ -146,8 +146,8 @@ class FloatingContext {
     _adjustedFloatingPosition(floatingBox, verticalPosition, leftRightFloatings) {
         let containingBlock = floatingBox.containingBlock();
         // Convert all coordinates relative to formatting context's root.
-        let left = this._formattingContext().absoluteContentBox(containingBlock).left();
-        let right = this._formattingContext().absoluteContentBox(containingBlock).right();
+        let left = this._mapContentBoxToFormattingRoot(containingBlock).left();
+        let right = this._mapContentBoxToFormattingRoot(containingBlock).right();
         if (leftRightFloatings) {
             if (leftRightFloatings.left) {
                 let floatingBoxRight = leftRightFloatings.left.right();
@@ -165,8 +165,8 @@ class FloatingContext {
         right -= this._formattingContext().marginRight(floatingBox);
         verticalPosition += this._formattingContext().marginTop(floatingBox);
         // No convert them back relative to the floatingBox's containing block.
-        let containingBlockLeft = this._formattingContext().absoluteBorderBox(containingBlock).left();
-        let containingBlockTop = this._formattingContext().absoluteBorderBox(containingBlock).top();
+        let containingBlockLeft = this._mapBorderBoxToFormattingRoot(containingBlock).left();
+        let containingBlockTop = this._mapBorderBoxToFormattingRoot(containingBlock).top();
         left -= containingBlockLeft;
         right -= containingBlockLeft;
         verticalPosition -= containingBlockTop;
@@ -198,6 +198,18 @@ class FloatingContext {
         return Utils.marginBox(displayBox, rootDisplayBox);
     }
 
+    _mapBorderBoxToFormattingRoot(layoutBox) {
+        let displayBox = this._formattingState().displayBox(layoutBox);
+        let rootDisplayBox = this._formattingState().displayBox(this._formattingRoot());
+        return Utils.borderBox(displayBox, rootDisplayBox);
+    }
+
+    _mapContentBoxToFormattingRoot(layoutBox) {
+        let displayBox = this._formattingState().displayBox(layoutBox);
+        let rootDisplayBox = this._formattingState().displayBox(this._formattingRoot());
+        return Utils.contentBox(displayBox, rootDisplayBox);
+    }
+
     _floatingState() {
         return this.m_floatingState;
     }

diff --git a/Tools/LayoutReloaded/FormattingContext/FormattingContext.js b/Tools/LayoutReloaded/FormattingContext/FormattingContext.js
index 13f912a11c1ff5fbd93a43d3db12a62854a27d26..f521f054e352fdd1cca2fdd000fa7000a34f26cf 100644 (file)
--- a/Tools/LayoutReloaded/FormattingContext/FormattingContext.js
+++ b/Tools/LayoutReloaded/FormattingContext/FormattingContext.js
@@ -72,44 +72,6 @@ class FormattingContext {
         return Utils.computedMarginRight(layoutBox.node());
     }
 
-    absoluteBorderBox(layoutBox) {
-        let borderBox = this.displayBox(layoutBox).borderBox();
-        let absoluteRect = new LayoutRect(this._toRootAbsolutePosition(layoutBox), borderBox.size());
-        absoluteRect.moveBy(borderBox.topLeft());
-        return absoluteRect;
-    }
-
-    absolutePaddingBox(layoutBox) {
-        let paddingBox = this.displayBox(layoutBox).paddingBox();
-        let absoluteRect = new LayoutRect(this._toRootAbsolutePosition(layoutBox), paddingBox.size());
-        absoluteRect.moveBy(paddingBox.topLeft());
-        return absoluteRect;
-    }
-
-    absoluteContentBox(layoutBox) {
-        let contentBox = this.displayBox(layoutBox).contentBox();
-        let absoluteRect = new LayoutRect(this._toRootAbsolutePosition(layoutBox), contentBox.size());
-        absoluteRect.moveBy(contentBox.topLeft());
-        return absoluteRect;
-    }
-
-    _toAbsolutePosition(position, layoutBox, container) {
-        // We should never need to go beyond the root container.
-        ASSERT(container == this.formattingRoot() || container.isDescendantOf(this.formattingRoot()));
-        let absolutePosition = position;
-        let ascendant = layoutBox.containingBlock();
-        while (ascendant && ascendant != container) {
-            ASSERT(ascendant.isDescendantOf(this.formattingRoot()));
-            absolutePosition.moveBy(this.displayBox(ascendant).topLeft());
-            ascendant = ascendant.containingBlock();
-        }
-        return absolutePosition;
-    }
-
-    _toRootAbsolutePosition(layoutBox) {
-        return this._toAbsolutePosition(this.displayBox(layoutBox).topLeft(), layoutBox, this.formattingRoot());
-    }
-
     _descendantNeedsLayout() {
         return this.m_layoutStack.length;
     }

diff --git a/Tools/LayoutReloaded/Utils.js b/Tools/LayoutReloaded/Utils.js
index b53f9c901d814c975047986fe48214c229321e18..2e61228a574b99bd3b5a2ffd4d0bfb21beead82c 100644 (file)
--- a/Tools/LayoutReloaded/Utils.js
+++ b/Tools/LayoutReloaded/Utils.js
@@ -475,18 +475,36 @@ class Utils {
         return window.getComputedStyle(node).float == "left";
     }
 
-    static marginBox(box, container) {
+    static mapPosition(position, box, container) {
         ASSERT(box instanceof Display.Box);
         ASSERT(container instanceof Display.Box);
 
-        let marginBox = box.marginBox();
         if (box == container)
-            return marginBox;
+            return position;
         for (let ascendant = box.parent(); ascendant && ascendant != container; ascendant = ascendant.parent())
-            marginBox.moveBy(ascendant.topLeft());
-        return marginBox;
+            position.moveBy(ascendant.topLeft());
+        return position;
     }
 
+    static marginBox(box, container) {
+        let marginBox = box.marginBox();
+        let mappedPosition = Utils.mapPosition(marginBox.topLeft(), box, container);
+        return new LayoutRect(mappedPosition, marginBox.size());
+    }
+
+    static borderBox(box, container) {
+        let borderBox = box.borderBox();
+        let mappedPosition = Utils.mapPosition(box.topLeft(), box, container);
+        mappedPosition.moveBy(borderBox.topLeft());
+        return new LayoutRect(mappedPosition, borderBox.size());
+    }
+
+    static contentBox(box, container) {
+        let contentBox = box.contentBox();
+        let mappedPosition = Utils.mapPosition(box.topLeft(), box, container);
+        mappedPosition.moveBy(contentBox.topLeft());
+        return new LayoutRect(mappedPosition, contentBox.size());
+    }
 
     static textRuns(text, container) {
         return window.collectTextRuns(text, container.node());