[LayoutReloaded] Remove FormattingContext::absoluteMarginBox

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

Reviewed by Antti Koivisto.

Display.Box already has the margin values.

* LayoutReloaded/FormattingContext/FloatingContext.js:
(FloatingContext.prototype._positionForFloating):
(FloatingContext.prototype._addFloatingBox):
(FloatingContext.prototype._mapMarginBoxToFormattingRoot):
(FloatingContext.prototype._formattingRoot):
* LayoutReloaded/FormattingContext/FormattingContext.js:
(FormattingContext.prototype.absoluteMarginBox): Deleted.
* LayoutReloaded/Utils.js:
(Utils.marginBox):

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 129efda7cfc3935cff84ef5406e0495d29ef70a3..39e16c541ee83b6fba3be4df3ead603495786267 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2018-03-31  Zalan Bujtas  <zalan@apple.com>
+
+        [LayoutReloaded] Remove FormattingContext::absoluteMarginBox
+        https://bugs.webkit.org/show_bug.cgi?id=184213
+
+        Reviewed by Antti Koivisto.
+
+        Display.Box already has the margin values.
+
+        * LayoutReloaded/FormattingContext/FloatingContext.js:
+        (FloatingContext.prototype._positionForFloating):
+        (FloatingContext.prototype._addFloatingBox):
+        (FloatingContext.prototype._mapMarginBoxToFormattingRoot):
+        (FloatingContext.prototype._formattingRoot):
+        * LayoutReloaded/FormattingContext/FormattingContext.js:
+        (FormattingContext.prototype.absoluteMarginBox): Deleted.
+        * LayoutReloaded/Utils.js:
+        (Utils.marginBox):
+
 2018-03-31  Zalan Bujtas  <zalan@apple.com>
 
         [layoutReloaded] Introduce margin to Display.Box

diff --git a/Tools/LayoutReloaded/FormattingContext/FloatingContext.js b/Tools/LayoutReloaded/FormattingContext/FloatingContext.js
index f434d0e12fedde59a2774db9f9479ea96ee641ce..ea26abc88327a97bc298e2cbd84f6602e0a4d554 100644 (file)
--- a/Tools/LayoutReloaded/FormattingContext/FloatingContext.js
+++ b/Tools/LayoutReloaded/FormattingContext/FloatingContext.js
@@ -58,7 +58,7 @@ class FloatingContext {
     }
 
     _positionForFloating(floatingBox) {
-        let absoluteFloatingBox = this._formattingContext().absoluteMarginBox(floatingBox);
+        let absoluteFloatingBox = this._mapMarginBoxToFormattingRoot(floatingBox);
         if (this._isEmpty())
             return this._adjustedFloatingPosition(floatingBox, absoluteFloatingBox.top());
         let verticalPosition = Math.max(absoluteFloatingBox.top(), this._lastFloating().top());
@@ -188,10 +188,16 @@ class FloatingContext {
     _addFloatingBox(layoutBox) {
         // Convert floating box to absolute.
         let clonedDisplayBox = this._formattingContext().displayBox(layoutBox).clone();
-        clonedDisplayBox.setRect(this._formattingContext().absoluteMarginBox(layoutBox));
+        clonedDisplayBox.setRect(this._mapMarginBoxToFormattingRoot(layoutBox));
         this._floatingState().addFloating(layoutBox, clonedDisplayBox);
     }
 
+    _mapMarginBoxToFormattingRoot(layoutBox) {
+        let displayBox = this._formattingState().displayBox(layoutBox);
+        let rootDisplayBox = this._formattingState().displayBox(this._formattingRoot());
+        return Utils.marginBox(displayBox, rootDisplayBox);
+    }
+
     _floatingState() {
         return this.m_floatingState;
     }
@@ -200,6 +206,10 @@ class FloatingContext {
         return this.m_parentFormattingContext;
     }
 
+    _formattingRoot() {
+        return this._formattingState().formattingRoot();
+    }
+
     _formattingState() {
         return this._floatingState().formattingState();
     }

diff --git a/Tools/LayoutReloaded/FormattingContext/FormattingContext.js b/Tools/LayoutReloaded/FormattingContext/FormattingContext.js
index c1455d495f59c2b7cfd9078e6dc88f98df799e63..13f912a11c1ff5fbd93a43d3db12a62854a27d26 100644 (file)
--- a/Tools/LayoutReloaded/FormattingContext/FormattingContext.js
+++ b/Tools/LayoutReloaded/FormattingContext/FormattingContext.js
@@ -72,14 +72,6 @@ class FormattingContext {
         return Utils.computedMarginRight(layoutBox.node());
     }
 
-    absoluteMarginBox(layoutBox) {
-        let displayBox = this.displayBox(layoutBox);
-        let absoluteRect = new LayoutRect(this._toRootAbsolutePosition(layoutBox), displayBox.borderBox().size());
-        absoluteRect.moveBy(new LayoutSize(-displayBox.marginLeft(), -displayBox.marginTop()));
-        absoluteRect.growBy(new LayoutSize(displayBox.marginLeft() + displayBox.marginRight(), displayBox.marginTop() + displayBox.marginBottom()));
-        return absoluteRect;
-    }
-
     absoluteBorderBox(layoutBox) {
         let borderBox = this.displayBox(layoutBox).borderBox();
         let absoluteRect = new LayoutRect(this._toRootAbsolutePosition(layoutBox), borderBox.size());

diff --git a/Tools/LayoutReloaded/Utils.js b/Tools/LayoutReloaded/Utils.js
index 6537066685b10d8afd0d75345bfc3efe493040fc..b53f9c901d814c975047986fe48214c229321e18 100644 (file)
--- a/Tools/LayoutReloaded/Utils.js
+++ b/Tools/LayoutReloaded/Utils.js
@@ -475,6 +475,19 @@ class Utils {
         return window.getComputedStyle(node).float == "left";
     }
 
+    static marginBox(box, container) {
+        ASSERT(box instanceof Display.Box);
+        ASSERT(container instanceof Display.Box);
+
+        let marginBox = box.marginBox();
+        if (box == container)
+            return marginBox;
+        for (let ascendant = box.parent(); ascendant && ascendant != container; ascendant = ascendant.parent())
+            marginBox.moveBy(ascendant.topLeft());
+        return marginBox;
+    }
+
+
     static textRuns(text, container) {
         return window.collectTextRuns(text, container.node());
     }