Bug 847223. Part 6. Use the first reflow of relevant image frames to add/remove them from the visible list. r=mats

layout/generic/nsImageFrame.h

@@ -17,6 +17,7 @@
 #include "nsDisplayList.h"
 #include "imgIContainer.h"
 #include "mozilla/Attributes.h"
+#include "nsIReflowCallback.h"
 
 class nsImageMap;
 class nsIURI;
@@ -57,7 +58,8 @@ private:
 
 #define ImageFrameSuper nsSplittableFrame
 
-class nsImageFrame : public ImageFrameSuper {
+class nsImageFrame : public ImageFrameSuper,
+                     public nsIReflowCallback {
 public:
   typedef mozilla::layers::ImageContainer ImageContainer;
   typedef mozilla::layers::ImageLayer ImageLayer;
@@ -166,6 +168,11 @@ public:
                                  InlineMinWidthData *aData);
 
   void DisconnectMap();
+
+  // nsIReflowCallback
+  virtual bool ReflowFinished() MOZ_OVERRIDE;
+  virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
+
 protected:
   virtual ~nsImageFrame();
 
@@ -284,6 +291,7 @@ private:
 
   bool mDisplayingIcon;
   bool mFirstFrameComplete;
+  bool mReflowCallbackPosted;
 
   static nsIIOService* sIOService;