Title: [255951] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 255951
- Author
- [email protected]
- Date
- 2020-02-06 07:12:12 -0800 (Thu, 06 Feb 2020)
Log Message
Merge r255908 - Crash when printing at WebCore: WebCore::FrameView::paintContents
<https://webkit.org/b/207313>
<rdar://problem/56675778>
Reviewed by Brent Fulgham.
* page/PrintContext.cpp:
(WebCore::PrintContext::spoolPage):
(WebCore::PrintContext::spoolRect):
- Add nullptr check for frame.view(). This matches similar
checks in other methods.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (255950 => 255951)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-06 15:12:08 UTC (rev 255950)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-06 15:12:12 UTC (rev 255951)
@@ -1,3 +1,17 @@
+2020-02-05 David Kilzer <[email protected]>
+
+ Crash when printing at WebCore: WebCore::FrameView::paintContents
+ <https://webkit.org/b/207313>
+ <rdar://problem/56675778>
+
+ Reviewed by Brent Fulgham.
+
+ * page/PrintContext.cpp:
+ (WebCore::PrintContext::spoolPage):
+ (WebCore::PrintContext::spoolRect):
+ - Add nullptr check for frame.view(). This matches similar
+ checks in other methods.
+
2020-02-05 Don Olmstead <[email protected]>
[PlayStation] Miscellaneous build fixes February 2020 edition
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/page/PrintContext.cpp (255950 => 255951)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/page/PrintContext.cpp 2020-02-06 15:12:08 UTC (rev 255950)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/page/PrintContext.cpp 2020-02-06 15:12:12 UTC (rev 255951)
@@ -230,6 +230,9 @@
return;
auto& frame = *this->frame();
+ if (!frame.view())
+ return;
+
// FIXME: Not correct for vertical text.
IntRect pageRect = m_pageRects[pageNumber];
float scale = width / pageRect.width();
@@ -249,6 +252,9 @@
return;
auto& frame = *this->frame();
+ if (!frame.view())
+ return;
+
// FIXME: Not correct for vertical text.
ctx.save();
ctx.translate(-rect.x(), -rect.y());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
