Changeset 236288 in webkit

Timestamp:

Sep 20, 2018, 3:27:28 PM (8 years ago)

Author:

Alan Bujtas

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/printing/crash-while-formatting-subframe-for-printing-expected.txt (added)
• LayoutTests/printing/crash-while-formatting-subframe-for-printing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-20  Zalan Bujtas  <zalan@apple.com>
+
+        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-20  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-20  Zalan Bujtas  <zalan@apple.com>
+
+        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-20  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -249 +249 @@
 LayoutUnit RenderView::pageOrViewLogicalHeight() const
 {
-    if (document().printing())
+    if (shouldUsePrintingLayout())
         return m_pageLogicalSize->height();