Title: [148991] trunk/Source/WebKit2
- Revision
- 148991
- Author
- [email protected]
- Date
- 2013-04-23 14:04:53 -0700 (Tue, 23 Apr 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.
Stop the primary plugin detection timer if the WebPage is torn down.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::close):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (148990 => 148991)
--- trunk/Source/WebKit2/ChangeLog 2013-04-23 20:58:56 UTC (rev 148990)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-23 21:04:53 UTC (rev 148991)
@@ -1,3 +1,16 @@
+2013-04-23 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.
+
+ Stop the primary plugin detection timer if the WebPage is torn down.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::close):
+
2013-04-23 Carlos Garcia Campos <[email protected]>
[GTK] Add webkit_uri_request_get_http_headers to WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (148990 => 148991)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-23 20:58:56 UTC (rev 148990)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-04-23 21:04:53 UTC (rev 148991)
@@ -833,6 +833,10 @@
m_sandboxExtensionTracker.invalidate();
+#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
+ m_determinePrimarySnapshottedPlugInTimer.stop();
+#endif
+
m_underlayPage = nullptr;
m_printContext = nullptr;
m_mainFrame->coreFrame()->loader()->detachFromParent();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes