Title: [149535] trunk/Source/WebKit2
- Revision
- 149535
- Author
- [email protected]
- Date
- 2013-05-03 13:56:22 -0700 (Fri, 03 May 2013)
Log Message
Web process crashes at WebPage::determinePrimarySnapshottedPlugInTimerFired + 8
https://bugs.webkit.org/show_bug.cgi?id=115056
<rdar://problem/13719543>
Reviewed by Simon Fraser.
Null-check m_page. In theory, we shouldn't get here, because we stop
the timer at the only point where m_page is cleared, but crash logs say
we're still crashing here.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::determinePrimarySnapshottedPlugInTimerFired):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149534 => 149535)
--- trunk/Source/WebKit2/ChangeLog 2013-05-03 20:55:53 UTC (rev 149534)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-03 20:56:22 UTC (rev 149535)
@@ -1,5 +1,20 @@
2013-05-03 Tim Horton <[email protected]>
+ Web process crashes at WebPage::determinePrimarySnapshottedPlugInTimerFired + 8
+ https://bugs.webkit.org/show_bug.cgi?id=115056
+ <rdar://problem/13719543>
+
+ Reviewed by Simon Fraser.
+
+ Null-check m_page. In theory, we shouldn't get here, because we stop
+ the timer at the only point where m_page is cleared, but crash logs say
+ we're still crashing here.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::determinePrimarySnapshottedPlugInTimerFired):
+
+2013-05-03 Tim Horton <[email protected]>
+
Remove some "what" comments from FindController
https://bugs.webkit.org/show_bug.cgi?id=115546
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (149534 => 149535)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-03 20:55:53 UTC (rev 149534)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-05-03 20:56:22 UTC (rev 149535)
@@ -3993,7 +3993,11 @@
#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
void WebPage::determinePrimarySnapshottedPlugInTimerFired()
{
- if (!m_page->settings()->snapshotAllPlugIns() && m_page->settings()->primaryPlugInSnapshotDetectionEnabled())
+ if (!m_page)
+ return;
+
+ Settings* settings = m_page->settings();
+ if (!settings->snapshotAllPlugIns() && settings->primaryPlugInSnapshotDetectionEnabled())
determinePrimarySnapshottedPlugIn();
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
