Merge m-i to m-c (to pick up a followup for bug 666446 that was merged earlier)

content/base/public/nsIImageLoadingContent.idl

@@ -133,13 +133,13 @@ interface nsIImageLoadingContent : imgIDecoderObserver
    * Used to notify the image loading content node that a frame has been
    * created.
    */
-  void frameCreated(in nsIFrame aFrame);
+  [notxpcom] void frameCreated(in nsIFrame aFrame);
 
   /**
    * Used to notify the image loading content node that a frame has been
    * destroyed.
    */
-  void frameDestroyed(in nsIFrame aFrame);
+  [notxpcom] void frameDestroyed(in nsIFrame aFrame);
 
   /**
    * Used to find out what type of request one is dealing with (eg

content/base/src/nsImageLoadingContent.cpp

@@ -512,7 +512,7 @@ nsImageLoadingContent::GetRequest(PRInt32 aRequestType,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+NS_IMETHODIMP_(void)
 nsImageLoadingContent::FrameCreated(nsIFrame* aFrame)
 {
   NS_ASSERTION(aFrame, "aFrame is null");
@@ -532,11 +532,9 @@ nsImageLoadingContent::FrameCreated(nsIFrame* aFrame)
     nsLayoutUtils::RegisterImageRequest(presContext, mPendingRequest,
                                         &mPendingRequestRegistered);
   }
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
+NS_IMETHODIMP_(void)
 nsImageLoadingContent::FrameDestroyed(nsIFrame* aFrame)
 {
   NS_ASSERTION(aFrame, "aFrame is null");
@@ -551,8 +549,6 @@ nsImageLoadingContent::FrameDestroyed(nsIFrame* aFrame)
                                           mPendingRequest,
                                           &mPendingRequestRegistered);
   }
-
-  return NS_OK;
 }
 
 NS_IMETHODIMP

layout/tools/reftest/reftest.js

@@ -876,12 +876,6 @@ function ServeFiles(manifestURL, depth, aURL, files)
 // Return true iff this window is focused when this function returns.
 function Focus()
 {
-    // FIXME/bug 583976: focus doesn't yet work with out-of-process
-    // content.
-    if (gBrowserIsRemote) {
-        return false;
-    }
-
     var fm = CC["@mozilla.org/focus-manager;1"].getService(CI.nsIFocusManager);
     fm.activeWindow = window;
     try {