[LayoutReloaded] Set inline-block box position.

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

Reviewed by Antti Koivisto.

* LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js:
(InlineFormattingContext.prototype._handleInlineBlock):
* LayoutReloaded/Utils.js:
(Utils._dumpBox):
* LayoutReloaded/test/inline-block-with-fixed-width-height.html:

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f3956064f7d27d03e620966b7e8e85b05fd94bee..5fd27535d80932458a68043b034fd2fb1c6c2116 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2018-04-17  Zalan Bujtas  <zalan@apple.com>
+
+        [LayoutReloaded] Set inline-block box position.
+        https://bugs.webkit.org/show_bug.cgi?id=184690
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js:
+        (InlineFormattingContext.prototype._handleInlineBlock):
+        * LayoutReloaded/Utils.js:
+        (Utils._dumpBox):
+        * LayoutReloaded/test/inline-block-with-fixed-width-height.html:
+
 2018-04-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GLIB] Add API to clear JSCContext uncaught exception

diff --git a/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js b/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js
index d32583cad7e172ef481e03aad4e7dde343c11598..c421cb8a1d0e6c42191c1cafd579c355f016a979 100644 (file)
--- a/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js
+++ b/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js
@@ -118,6 +118,7 @@ class InlineFormattingContext extends FormattingContext {
         this.layoutState().formattingContext(inlineBlockBox).layout();
         displayBox.setHeight(Utils.height(inlineBlockBox) + Utils.computedVerticalBorderAndPadding(inlineBlockBox.node()));
         this._line().addInlineBox(displayBox.size());
+        displayBox.setTopLeft(this._line().lastLineBox().lineBoxRect.topLeft());
         this._adjustLineForInlineContainerEnd(inlineBlockBox);
     }
 

diff --git a/Tools/LayoutReloaded/Utils.js b/Tools/LayoutReloaded/Utils.js
index a7386700313f1e533a98eaf30f4f4178d5a99da0..b491924e2a0ee01c6e4235ee1da62261e785dcdd 100644 (file)
--- a/Tools/LayoutReloaded/Utils.js
+++ b/Tools/LayoutReloaded/Utils.js
@@ -584,16 +584,11 @@ class Utils {
             }
             return indentation + box.node().tagName + " " + box.name() + "\n";
         }
-        if (box.name() == "RenderImage") {
-            let boxRect = layoutState.displayBox(box).rect();
-            return indentation + box.node().tagName + " " + box.name() + " at (" + Utils.precisionRound(boxRect.left()) + "," + Utils.precisionRound(boxRect.top()) + ") size " + Utils.precisionRound(boxRect.width()) + "x" + Utils.precisionRound(boxRect.height()) + "\n";
-
-        }
         if (box.isAnonymous())
             return "";
         let displayBox = layoutState.displayBox(box);
         let boxRect = displayBox.rect();
-        return indentation + (box.node().tagName ? (box.node().tagName + " ") : "")  + box.name() + " at (" + boxRect.left() + "," + boxRect.top() + ") size " + boxRect.width() + "x" + boxRect.height() + "\n";
+        return indentation + (box.node().tagName ? (box.node().tagName + " ") : "")  + box.name() + " at (" + Utils.precisionRound(boxRect.left()) + "," + Utils.precisionRound(boxRect.top()) + ") size " + Utils.precisionRound(boxRect.width()) + "x" + Utils.precisionRound(boxRect.height()) + "\n";
     }
 
     static _dumpLines(layoutState, root, level) {

diff --git a/Tools/LayoutReloaded/test/inline-block-with-fixed-width-height.html b/Tools/LayoutReloaded/test/inline-block-with-fixed-width-height.html
index b00001cedf72e994fe00f43e73a4298cff5166a9..b0602193119222f79b00787430a234ef592611c6 100644 (file)
--- a/Tools/LayoutReloaded/test/inline-block-with-fixed-width-height.html
+++ b/Tools/LayoutReloaded/test/inline-block-with-fixed-width-height.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
 <body>
-<div style="height: 500px"><span style="display: inline-block; width: 200px; height: 100px;">foobar</span></div>
+<div style="height: 500px">foo<span style="margin-left: 30px; display: inline-block; width: 200px; height: 100px;">foobar</span>foobar</div>
 </body>
 </html>