Bug 683290: Followup to placate nsObjectLoadingContent. r=johns
authorKyle Huey <khuey@kylehuey.com>
Tue, 14 Aug 2012 10:15:45 -0700
changeset 102439 91711277a553ec1800d0fd7b062512a26b93151a
parent 102438 30ce9f55180f0f94bff4a7a99e5cbc94e6b9bb72
child 102440 d1b05e332e4e8ea05d990ca44054c2cc5246b0e2
push id13467
push useremorley@mozilla.com
push dateWed, 15 Aug 2012 18:01:05 +0000
treeherdermozilla-inbound@62bb2e74fe67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohns
bugs683290
milestone17.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 683290: Followup to placate nsObjectLoadingContent. r=johns
content/base/src/nsObjectLoadingContent.cpp
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -635,18 +635,18 @@ nsObjectLoadingContent::UnbindFromTree(b
     // has still not been added back to the document then we tear down the
     // plugin
     nsCOMPtr<nsIRunnable> event = new InDocCheckEvent(this);
 
     nsCOMPtr<nsIAppShell> appShell = do_GetService(kAppShellCID);
     if (appShell) {
       appShell->RunInStableState(event);
     }
-  } else if (mType == eType_Document) {
-    // XXXkhuey is this even required?
+  } else if (mType != eType_Image) {
+    // nsImageLoadingContent handles the image case.
     // Reset state and clear pending events
     /// XXX(johns): The implementation for GenericFrame notes that ideally we
     ///             would keep the docshell around, but trash the frameloader
     UnloadObject();
   }
 
 }