Title: [210351] branches/safari-603-branch/Source/WebKit2
- Revision
- 210351
- Author
- [email protected]
- Date
- 2017-01-05 09:09:27 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210118. rdar://problem/29732407
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210350 => 210351)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-05 17:09:25 UTC (rev 210350)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-05 17:09:27 UTC (rev 210351)
@@ -1,5 +1,21 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210118. rdar://problem/29732407
+
+ 2016-12-22 Tim Horton <[email protected]>
+
+ Null deref under WebPageProxy::applicationDidFinishSnapshottingAfterEnteringBackground
+ https://bugs.webkit.org/show_bug.cgi?id=166433
+ <rdar://problem/29732407>
+
+ Reviewed by Daniel Bates.
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidFinishSnapshottingAfterEnteringBackground):
+ m_drawingArea can be null if the process is not valid.
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210041. rdar://problem/29593525
2016-12-20 Simon Fraser <[email protected]>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (210350 => 210351)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2017-01-05 17:09:25 UTC (rev 210350)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2017-01-05 17:09:27 UTC (rev 210351)
@@ -687,7 +687,8 @@
void WebPageProxy::applicationDidFinishSnapshottingAfterEnteringBackground()
{
- m_drawingArea->prepareForAppSuspension();
+ if (m_drawingArea)
+ m_drawingArea->prepareForAppSuspension();
m_process->send(Messages::WebPage::ApplicationDidFinishSnapshottingAfterEnteringBackground(), m_pageID);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
