Title: [235029] releases/WebKitGTK/webkit-2.22/Source/WebCore
- Revision
- 235029
- Author
- carlo...@webkit.org
- Date
- 2018-08-20 02:30:41 -0700 (Mon, 20 Aug 2018)
Log Message
Merge r234922 - [LFC] Bail out of subtree verification when trees are out of sync.
https://bugs.webkit.org/show_bug.cgi?id=188633
Reviewed by Antti Koivisto.
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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (235028 => 235029)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-08-20 09:30:37 UTC (rev 235028)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-08-20 09:30:41 UTC (rev 235029)
@@ -1,3 +1,16 @@
+2018-08-16 Zalan Bujtas <za...@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 Antti Koivisto.
+
+ 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-16 Antti Koivisto <an...@apple.com>
Use OptionSet for ActivityState::Flags
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/layout/Verification.cpp (235028 => 235029)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/layout/Verification.cpp 2018-08-20 09:30:37 UTC (rev 235028)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/layout/Verification.cpp 2018-08-20 09:30:41 UTC (rev 235029)
@@ -170,6 +170,12 @@
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 @@
childBox = childBox->nextSibling();
childRenderer = childRenderer->nextSibling();
}
+
return mismtachingGeometry;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
