Title: [262844] trunk/Source/WebKit
- Revision
- 262844
- Author
- commit-qu...@webkit.org
- Date
- 2020-06-10 10:42:26 -0700 (Wed, 10 Jun 2020)
Log Message
Add some null checks in PDFPlugin::updatePageAndDeviceScaleFactors
https://bugs.webkit.org/show_bug.cgi?id=213009
<rdar://problem/63756100>
Patch by Alex Christensen <achristen...@webkit.org> on 2020-06-10
Reviewed by Chris Dumez.
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::updatePageAndDeviceScaleFactors):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (262843 => 262844)
--- trunk/Source/WebKit/ChangeLog 2020-06-10 16:51:19 UTC (rev 262843)
+++ trunk/Source/WebKit/ChangeLog 2020-06-10 17:42:26 UTC (rev 262844)
@@ -1,3 +1,14 @@
+2020-06-10 Alex Christensen <achristen...@webkit.org>
+
+ Add some null checks in PDFPlugin::updatePageAndDeviceScaleFactors
+ https://bugs.webkit.org/show_bug.cgi?id=213009
+ <rdar://problem/63756100>
+
+ Reviewed by Chris Dumez.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::updatePageAndDeviceScaleFactors):
+
2020-06-09 Fujii Hironori <hironori.fu...@sony.com>
Unreviewed, reverting r262791.
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (262843 => 262844)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2020-06-10 16:51:19 UTC (rev 262843)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2020-06-10 17:42:26 UTC (rev 262844)
@@ -1742,9 +1742,14 @@
void PDFPlugin::updatePageAndDeviceScaleFactors()
{
+ if (!controller())
+ return;
+
double newScaleFactor = controller()->contentsScaleFactor();
- if (!handlesPageScaleFactor())
- newScaleFactor *= m_frame.page()->pageScaleFactor();
+ if (!handlesPageScaleFactor()) {
+ if (auto* page = m_frame.page())
+ newScaleFactor *= page->pageScaleFactor();
+ }
if (newScaleFactor != [m_pdfLayerController deviceScaleFactor])
[m_pdfLayerController setDeviceScaleFactor:newScaleFactor];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
