Bug 878037 - Make static image requests (imgRequestProxyStatic) Clone correctly when the concrete-type Clone override is called. r=seth

image/src/imgRequestProxy.cpp

@@ -1045,13 +1045,9 @@ NS_IMETHODIMP imgRequestProxyStatic::GetImagePrincipal(nsIPrincipal **aPrincipal
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 imgRequestProxyStatic::Clone(imgINotificationObserver* aObserver,
-                             imgIRequest** aClone)
+                             imgRequestProxy** aClone)
 {
-  nsresult result;
-  imgRequestProxy* proxy;
-  result = PerformClone(aObserver, NewStaticProxy, &proxy);
-  *aClone = proxy;
-  return result;
+  return PerformClone(aObserver, NewStaticProxy, aClone);
 }

image/src/imgRequestProxy.h

@@ -104,7 +104,7 @@ public:
   // imgRequest::RemoveProxy
   void ClearAnimationConsumers();
 
-  nsresult Clone(imgINotificationObserver* aObserver, imgRequestProxy** aClone);
+  virtual nsresult Clone(imgINotificationObserver* aObserver, imgRequestProxy** aClone);
   nsresult GetStaticRequest(imgRequestProxy** aReturn);
 
 protected:
@@ -231,8 +231,10 @@ public:
 
   NS_IMETHOD GetImagePrincipal(nsIPrincipal** aPrincipal) MOZ_OVERRIDE;
 
-  NS_IMETHOD Clone(imgINotificationObserver* aObserver,
-                   imgIRequest** aClone) MOZ_OVERRIDE;
+  using imgRequestProxy::Clone;
+
+  virtual nsresult Clone(imgINotificationObserver* aObserver,
+                         imgRequestProxy** aClone) MOZ_OVERRIDE;
 
 protected:
   friend imgRequestProxy* NewStaticProxy(imgRequestProxy*);