Title: [220385] branches/safari-604.1.38.1-branch/Source/WebCore
- Revision
- 220385
- Author
- jmarc...@apple.com
- Date
- 2017-08-07 22:48:26 -0700 (Mon, 07 Aug 2017)
Log Message
Cherry-pick r220333. rdar://problem/33601173
Modified Paths
Diff
Modified: branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog (220384 => 220385)
--- branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog 2017-08-08 03:20:19 UTC (rev 220384)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog 2017-08-08 05:48:26 UTC (rev 220385)
@@ -1,5 +1,29 @@
2017-08-07 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r220333. rdar://problem/33601173
+
+ 2017-08-07 Antti Koivisto <an...@apple.com>
+
+ REGRESSION (r219121): Airmail 3 prints header part only.
+ https://bugs.webkit.org/show_bug.cgi?id=175258
+ <rdar://problem/33601173>
+
+ Reviewed by Andreas Kling.
+
+ When a WK1 WebViw is printed via AppKit view hierarchy it won't explictly set the page width
+ but uses the existing width. r219121 assumes that all printing code paths set the page width.
+
+ No test, there appears to be no good way to test AppKit printing behaviors without adding complicated
+ new testing infrastructure.
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::layout):
+
+ If we are in printing layout and don't have page width set yet then use the current view width.
+ This matches the behavior prior r219121.
+
+2017-08-07 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r220248. rdar://problem/33754446
2017-08-03 Jeremy Jones <jere...@apple.com>
Modified: branches/safari-604.1.38.1-branch/Source/WebCore/rendering/RenderView.cpp (220384 => 220385)
--- branches/safari-604.1.38.1-branch/Source/WebCore/rendering/RenderView.cpp 2017-08-08 03:20:19 UTC (rev 220384)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/rendering/RenderView.cpp 2017-08-08 05:48:26 UTC (rev 220385)
@@ -341,7 +341,8 @@
m_pageLogicalSize = { };
if (shouldUsePrintingLayout()) {
- ASSERT(m_pageLogicalSize);
+ if (!m_pageLogicalSize)
+ m_pageLogicalSize = LayoutSize(logicalWidth(), 0);
m_minPreferredLogicalWidth = m_pageLogicalSize->width();
m_maxPreferredLogicalWidth = m_minPreferredLogicalWidth;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
