Bug 871942 - Don't synchronously stop plugins in DestroyContent. r=benjamin
authorJohn Schoenick <jschoenick@mozilla.com>
Wed, 15 May 2013 14:17:18 -0700
changeset 144302 9953a7663df4e2a230ff0d6be6c268bc3883f044
parent 144301 ab0ec721fc963cb10cbb0fa214e9eae2f944b486
child 144303 1fab16a30ed5471248a9a72884ff9512be7dc56c
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenjamin
bugs871942
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 871942 - Don't synchronously stop plugins in DestroyContent. r=benjamin
content/base/src/nsObjectLoadingContent.cpp
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -2140,17 +2140,17 @@ nsObjectLoadingContent::GetCapabilities(
 void
 nsObjectLoadingContent::DestroyContent()
 {
   if (mFrameLoader) {
     mFrameLoader->Destroy();
     mFrameLoader = nullptr;
   }
 
-  StopPluginInstance();
+  QueueCheckPluginStopEvent();
 }
 
 /* static */
 void
 nsObjectLoadingContent::Traverse(nsObjectLoadingContent *tmp,
                                  nsCycleCollectionTraversalCallback &cb)
 {
   NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mFrameLoader");