Backout changeset 5bdc787cf16f (bug 432391) for xpcshell crashes; a=bz
authorEd Morley <bmo@edmorley.co.uk>
Fri, 14 Oct 2011 22:34:24 +0100
changeset 78797 9a6b5bf1a10d4ebcb4a2150f16ecaee40f3d056e
parent 78796 fa9aa291f91a8c5c7546678ae8d0ce1cb2030358
child 78798 788f62b4e539892a53c53d252763f35530d19ee0
push id2691
push userbmo@edmorley.co.uk
push dateFri, 14 Oct 2011 21:35:03 +0000
treeherdermozilla-inbound@9a6b5bf1a10d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs432391
milestone10.0a1
backs out5bdc787cf16fbf1d85bccdfac9a2c89d169748ae
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
Backout changeset 5bdc787cf16f (bug 432391) for xpcshell crashes; a=bz
modules/libpr0n/src/imgRequestProxy.cpp
--- a/modules/libpr0n/src/imgRequestProxy.cpp
+++ b/modules/libpr0n/src/imgRequestProxy.cpp
@@ -47,17 +47,16 @@
 #include "nsString.h"
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
 #include "nsCRT.h"
 
 #include "Image.h"
 #include "ImageErrors.h"
 #include "ImageLogging.h"
-#include "imgLoader.h"
 
 #include "nspr.h"
 
 using namespace mozilla::imagelib;
 
 NS_IMPL_ADDREF(imgRequestProxy)
 NS_IMPL_RELEASE(imgRequestProxy)
 
@@ -524,24 +523,16 @@ NS_IMETHODIMP imgRequestProxy::Clone(img
   // only be notified for requests it's already holding pointers to it won't be
   // surprised.
   NS_ADDREF(*aClone = clone);
 
   // This is wrong!!! We need to notify asynchronously, but there's code that
   // assumes that we don't. This will be fixed in bug 580466.
   clone->SyncNotifyListener();
 
-  // It's weird to defer notifications now that we just dispatched
-  // them, but we need to do the latter, and imgCacheValidator demands
-  // the former.
-  if (mOwner->mValidator) {
-    clone->SetNotificationsDeferred(PR_TRUE);
-    mOwner->mValidator->AddProxy(clone);
-  }
-
   return NS_OK;
 }
 
 /* readonly attribute nsIPrincipal imagePrincipal; */
 NS_IMETHODIMP imgRequestProxy::GetImagePrincipal(nsIPrincipal **aPrincipal)
 {
   if (!mPrincipal)
     return NS_ERROR_FAILURE;