Attachment 370760 Details for Bug 198252 – Patch

[patch] Patch

bug-198252-20190528102734.patch (text/plain), 4.66 KB, created by zalan on 2019-05-28 10:27:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-05-28 10:27:35 PDT

Size: 4.66 KB

patch

obsolete

>Subversion Revision: 245815
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index defef70de643cc9b8ff113ff4a31baba35b800fc..a5b3cf9b0989a879872eacedce7ad32361f4135f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+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>
> 
>         [LFC][IFC] Decouple line layout and processing inline runs.
>diff --git a/Source/WebCore/layout/Verification.cpp b/Source/WebCore/layout/Verification.cpp
>index 95e36097019c1fb3afa363442eed6734287da9e1..ccf46d891b5babf6934ba23a56d66e79b6f36242 100644
>--- a/Source/WebCore/layout/Verification.cpp
>+++ b/Source/WebCore/layout/Verification.cpp
>@@ -108,16 +108,19 @@ static bool checkForMatchingNonTextRuns(const Display::Run& inlineRun, const Web
> {
>     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)
> {
>     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();
> }
> 
> static void collectFlowBoxSubtree(const InlineFlowBox& flowbox, Vector<WebCore::InlineBox*>& inlineBoxes)
>@@ -275,7 +278,7 @@ static bool verifyAndOutputSubtree(TextStream& stream, const LayoutState& contex
>         return mismtachingGeometry;
> 
>     auto& container = downcast<Container>(layoutBox);
>-    auto* childBox = container.firstChild();
>+    auto* childLayoutBox = container.firstChild();
>     auto* childRenderer = renderer.firstChild();
> 
>     while (childRenderer) {
>@@ -284,23 +287,27 @@ static bool verifyAndOutputSubtree(TextStream& stream, const LayoutState& contex
>             continue;
>         }
> 
>-        if (!childBox) {
>+        if (!childLayoutBox) {
>             stream  << "Trees are out of sync!";
>             stream.nextLine();
>             return true;
>         }
> 
>-        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();
>     }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 198252: 370642 | 370760