Title: [237503] releases/WebKitGTK/webkit-2.22
- Revision
- 237503
- Author
- [email protected]
- Date
- 2018-10-28 06:42:05 -0700 (Sun, 28 Oct 2018)
Log Message
Merged r236288 - Release assert under RenderView::pageOrViewLogicalHeight
https://bugs.webkit.org/show_bug.cgi?id=189798
<rdar://problem/43659749>
Reviewed by Simon Fraser.
Source/WebCore:
Only the mainframe's render view is sized to the page while printing.
Use the matching check (see RenderView::layout) when accessing m_pageLogicalSize.
Test: printing/crash-while-formatting-subframe-for-printing.html
* rendering/RenderView.cpp:
(WebCore::RenderView::pageOrViewLogicalHeight const):
LayoutTests:
* printing/crash-while-formatting-subframe-for-printing-expected.txt: Added.
* printing/crash-while-formatting-subframe-for-printing.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog (237502 => 237503)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog 2018-10-28 13:41:57 UTC (rev 237502)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog 2018-10-28 13:42:05 UTC (rev 237503)
@@ -1,3 +1,14 @@
+2018-09-20 Zalan Bujtas <[email protected]>
+
+ Release assert under RenderView::pageOrViewLogicalHeight
+ https://bugs.webkit.org/show_bug.cgi?id=189798
+ <rdar://problem/43659749>
+
+ Reviewed by Simon Fraser.
+
+ * printing/crash-while-formatting-subframe-for-printing-expected.txt: Added.
+ * printing/crash-while-formatting-subframe-for-printing.html: Added.
+
2018-09-11 Ryosuke Niwa <[email protected]>
imported/w3c/web-platform-tests/shadow-dom/form-control-form-attribute.html hits assertion
Added: releases/WebKitGTK/webkit-2.22/LayoutTests/printing/crash-while-formatting-subframe-for-printing-expected.txt (0 => 237503)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/printing/crash-while-formatting-subframe-for-printing-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/printing/crash-while-formatting-subframe-for-printing-expected.txt 2018-10-28 13:42:05 UTC (rev 237503)
@@ -0,0 +1 @@
+
Added: releases/WebKitGTK/webkit-2.22/LayoutTests/printing/crash-while-formatting-subframe-for-printing.html (0 => 237503)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/printing/crash-while-formatting-subframe-for-printing.html (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/printing/crash-while-formatting-subframe-for-printing.html 2018-10-28 13:42:05 UTC (rev 237503)
@@ -0,0 +1,17 @@
+<title>Unfortunately not 100% repro.</title>
+<body _onload_="runTests()">
+ <div id="foobar">
+ <iframe style="width: 90%" src="" style='width: 80%'>PASS if no crash</body>"></iframe>
+ </div>
+</body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function runTests() {
+ setTimeout(function() {
+ foobar.style.width = "400px";
+ }, 0);
+ window.print();
+}
+</script>
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (237502 => 237503)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-10-28 13:41:57 UTC (rev 237502)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-10-28 13:42:05 UTC (rev 237503)
@@ -1,3 +1,19 @@
+2018-09-20 Zalan Bujtas <[email protected]>
+
+ Release assert under RenderView::pageOrViewLogicalHeight
+ https://bugs.webkit.org/show_bug.cgi?id=189798
+ <rdar://problem/43659749>
+
+ Reviewed by Simon Fraser.
+
+ Only the mainframe's render view is sized to the page while printing.
+ Use the matching check (see RenderView::layout) when accessing m_pageLogicalSize.
+
+ Test: printing/crash-while-formatting-subframe-for-printing.html
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::pageOrViewLogicalHeight const):
+
2018-09-11 Ryosuke Niwa <[email protected]>
imported/w3c/web-platform-tests/shadow-dom/form-control-form-attribute.html hits assertion
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/RenderView.cpp (237502 => 237503)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/RenderView.cpp 2018-10-28 13:41:57 UTC (rev 237502)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/rendering/RenderView.cpp 2018-10-28 13:42:05 UTC (rev 237503)
@@ -248,7 +248,7 @@
LayoutUnit RenderView::pageOrViewLogicalHeight() const
{
- if (document().printing())
+ if (shouldUsePrintingLayout())
return m_pageLogicalSize->height();
if (multiColumnFlow() && !style().hasInlineColumnAxis()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
