Changeset 252922 in webkit

Timestamp:

Nov 28, 2019 6:34:45 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] adjustBaselineAndLineHeight should be called before resetting the line in quirk mode
​https://bugs.webkit.org/show_bug.cgi?id=204662
<rdar://problem/57513178>

Reviewed by Antti Koivisto.

• layout/inlineformatting/InlineLineBuilder.cpp:

(WebCore::Layout::LineBuilder::close):
(WebCore::Layout::LineBuilder::alignContentVertically):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLineBuilder.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-28  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] adjustBaselineAndLineHeight should be called before resetting the line in quirk mode
+        https://bugs.webkit.org/show_bug.cgi?id=204662
+        <rdar://problem/57513178>
+
+        Reviewed by Antti Koivisto.
+
+        * layout/inlineformatting/InlineLineBuilder.cpp:
+        (WebCore::Layout::LineBuilder::close):
+        (WebCore::Layout::LineBuilder::alignContentVertically):
+
 2019-11-28  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLineBuilder.cpp

@@ -272 +272 @@
 
     if (!m_skipAlignment) {
+        for (auto& run : runList) {
+            adjustBaselineAndLineHeight(run);
+            run.setLogicalHeight(runContentHeight(run));
+        }
         if (isVisuallyEmpty()) {
             m_lineBox.resetBaseline();
@@ -290 +294 @@
 {
     ASSERT(!m_skipAlignment);
-    for (auto& run : runList) {
-        adjustBaselineAndLineHeight(run);
-        run.setLogicalHeight(runContentHeight(run));
-    }
-
     for (auto& run : runList) {
         LayoutUnit logicalTop;