Attachment 347240 Details for Bug 188633 – Patch

[patch] Patch

bug-188633-20180815212306.patch (text/plain), 1.90 KB, created by zalan on 2018-08-15 21:23:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-08-15 21:23:08 PDT

Size: 1.90 KB

patch

obsolete

>Subversion Revision: 234903
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 45f39ffa7cb52927e6309e931190956946750dd3..aa80939e58c901273a5f59ac05a433170d827df2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Bail out of subtree verification when trees are out of sync.
>+        https://bugs.webkit.org/show_bug.cgi?id=188633
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        There's no point of trying to match geometry when subtrees are out of sync.
>+        They get out of sync when the render tree has unsupported boxes (see LayoutTreeBuilder).
>+
>+        * layout/Verification.cpp:
>+        (WebCore::Layout::verifyAndOutputSubtree):
>+
> 2018-08-15  Christopher Reid  <chris.reid@sony.com>
> 
>         [Curl] Implement default cookie path handling correctly as outlined in RFC6265.
>diff --git a/Source/WebCore/layout/Verification.cpp b/Source/WebCore/layout/Verification.cpp
>index 23d60af7a1ca90b22d91d8b20a7c3add291ee2e1..0b7d0acf8dce1d6138ee93f21b7aae6f1199d2bf 100644
>--- a/Source/WebCore/layout/Verification.cpp
>+++ b/Source/WebCore/layout/Verification.cpp
>@@ -170,6 +170,12 @@ static bool verifyAndOutputSubtree(TextStream& stream, const LayoutContext& cont
>             continue;
>         }
> 
>+        if (!childBox) {
>+            stream  << "Trees are out of sync!";
>+            stream.nextLine();
>+            return true;
>+        }
>+
>         if (is<RenderBlockFlow>(*childRenderer) && childBox->establishesInlineFormattingContext()) {
>             ASSERT(childRenderer->childrenInline());
>             auto& blockFlow = downcast<RenderBlockFlow>(*childRenderer);
>@@ -183,6 +189,7 @@ static bool verifyAndOutputSubtree(TextStream& stream, const LayoutContext& cont
>         childBox = childBox->nextSibling();
>         childRenderer = childRenderer->nextSibling();
>     }
>+
>     return mismtachingGeometry;
> }
>

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188633: 347240