Changeset 245816 in webkit

Timestamp:

May 28, 2019, 10:29:33 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][Verification] Add additional inline and block checks
​https://bugs.webkit.org/show_bug.cgi?id=198252
<rdar://problem/51140687>

Reviewed by Antti Koivisto.

Now we also test the geometry of the blocks with inline formatting contexts.

• layout/Verification.cpp:

(WebCore::Layout::checkForMatchingTextRuns):
(WebCore::Layout::verifyAndOutputSubtree):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/Verification.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-28  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Verification] Add additional inline and block checks
+        https://bugs.webkit.org/show_bug.cgi?id=198252
+        <rdar://problem/51140687>
+
+        Reviewed by Antti Koivisto.
+
+        Now we also test the geometry of the blocks with inline formatting contexts.
+
+        * layout/Verification.cpp:
+        (WebCore::Layout::checkForMatchingTextRuns):
+        (WebCore::Layout::verifyAndOutputSubtree):
+
 2019-05-28  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/Verification.cpp

@@ -109 +109 @@
     return areEssentiallyEqual(inlineBox.logicalLeft(), inlineRun.logicalLeft())
         && areEssentiallyEqual(inlineBox.logicalRight(), inlineRun.logicalRight())
-        && areEssentiallyEqual(inlineBox.logicalHeight(), inlineRun.logicalHeight());
-}
+        && areEssentiallyEqual(inlineBox.logicalTop(), inlineRun.logicalTop())
+        && areEssentiallyEqual(inlineBox.logicalBottom(), inlineRun.logicalBottom());
+}
+
 
 static bool checkForMatchingTextRuns(const Display::Run& inlineRun, const InlineTextBox& inlineTextBox)
@@ -116 +118 @@
     return areEssentiallyEqual(inlineTextBox.logicalLeft(), inlineRun.logicalLeft())
         && areEssentiallyEqual(inlineTextBox.logicalRight(), inlineRun.logicalRight())
+        && areEssentiallyEqual(inlineTextBox.logicalTop(), inlineRun.logicalTop())
+        && areEssentiallyEqual(inlineTextBox.logicalBottom(), inlineRun.logicalBottom())
         && inlineTextBox.start() == inlineRun.textContext()->start()
-        && (inlineTextBox.end() + 1) == inlineRun.textContext()->end()
-        && areEssentiallyEqual(inlineTextBox.logicalHeight(), inlineRun.logicalHeight());
+        && (inlineTextBox.end() + 1) == inlineRun.textContext()->end();
 }
 
@@ -276 +279 @@
 
     auto& container = downcast<Container>(layoutBox);
-    auto* childBox = container.firstChild();
+    auto* childLayoutBox = container.firstChild();
     auto* childRenderer = renderer.firstChild();
 
@@ -285 +288 @@
         }
 
-        if (!childBox) {
+        if (!childLayoutBox) {
             stream  << "Trees are out of sync!";
             stream.nextLine();
@@ -291 +294 @@
         }
 
-        if (is<RenderBlockFlow>(*childRenderer) && childBox->establishesInlineFormattingContext()) {
+        if (is<RenderBlockFlow>(*childRenderer) && childLayoutBox->establishesInlineFormattingContext()) {
             ASSERT(childRenderer->childrenInline());
+            auto mismtachingGeometry = outputMismatchingBlockBoxInformationIfNeeded(stream, context, downcast<RenderBox>(*childRenderer), *childLayoutBox);
+            if (mismtachingGeometry)
+                return true;
+
             auto& blockFlow = downcast<RenderBlockFlow>(*childRenderer);
-            auto& formattingRoot = downcast<Container>(*childBox);
+            auto& formattingRoot = downcast<Container>(*childLayoutBox);
             mismtachingGeometry |= blockFlow.lineLayoutPath() == RenderBlockFlow::SimpleLinesPath ? outputMismatchingSimpleLineInformationIfNeeded(stream, context, blockFlow, formattingRoot) : outputMismatchingComplexLineInformationIfNeeded(stream, context, blockFlow, formattingRoot);
         } else {
-            auto mismatchingSubtreeGeometry = verifyAndOutputSubtree(stream, context, downcast<RenderBox>(*childRenderer), *childBox);
+            auto mismatchingSubtreeGeometry = verifyAndOutputSubtree(stream, context, downcast<RenderBox>(*childRenderer), *childLayoutBox);
             mismtachingGeometry |= mismatchingSubtreeGeometry;
         }
 
-        childBox = childBox->nextSibling();
+        childLayoutBox = childLayoutBox->nextSibling();
         childRenderer = childRenderer->nextSibling();
     }