Changeset 236510 in webkit

Timestamp:

Sep 26, 2018, 11:20:09 AM (8 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r236288. rdar://problem/43659749

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@236288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

tags/Safari-607.1.7.3

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)

tags/Safari-607.1.7.3/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-26  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r236288. rdar://problem/43659749
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-19  Ms2ger  <Ms2ger@igalia.com>
 

tags/Safari-607.1.7.3/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-26  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r236288. rdar://problem/43659749
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236288 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-26  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-607.1.7.3/Source/WebCore/rendering/RenderView.cpp

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