Bug 1432348 - Make we sure call the right version of UpdateDrawResult for the display item geometry used. r=tnikkel

--HG--
extra : rebase_source : d5e1961a965374204116f5343c6922cb2593b12b

layout/generic/nsImageFrame.h

@@ -439,6 +439,11 @@ public:
    */
   virtual nsRect GetDestRect() const override;
 
+  virtual void UpdateDrawResult(mozilla::image::ImgDrawResult aResult) override
+  {
+    nsDisplayItemGenericImageGeometry::UpdateDrawResult(this, aResult);
+  }
+
   virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
                                    LayerManager* aManager,
                                    const ContainerLayerParameters& aParameters) override;

layout/painting/nsDisplayList.cpp

@@ -4494,7 +4494,7 @@ nsDisplayImageContainer::ConfigureLayer(ImageLayer* aLayer,
   if (imageWidth > 0 && imageHeight > 0) {
     // We're actually using the ImageContainer. Let our frame know that it
     // should consider itself to have painted successfully.
-    nsDisplayBackgroundGeometry::UpdateDrawResult(this, ImgDrawResult::SUCCESS);
+    UpdateDrawResult(ImgDrawResult::SUCCESS);
   }
 
   // XXX(seth): Right now we ignore aParameters.Scale() and

layout/painting/nsDisplayList.h

@@ -3247,6 +3247,8 @@ public:
   void ConfigureLayer(ImageLayer* aLayer,
                       const ContainerLayerParameters& aParameters);
 
+  virtual void UpdateDrawResult(mozilla::image::ImgDrawResult aResult) = 0;
+
   virtual already_AddRefed<imgIContainer> GetImage() = 0;
 
   virtual nsRect GetDestRect() const = 0;
@@ -3846,6 +3848,11 @@ public:
   virtual already_AddRefed<imgIContainer> GetImage() override;
   virtual nsRect GetDestRect() const override;
 
+  virtual void UpdateDrawResult(mozilla::image::ImgDrawResult aResult) override
+  {
+    nsDisplayBackgroundGeometry::UpdateDrawResult(this, aResult);
+  }
+
   static nsRegion GetInsideClipRegion(const nsDisplayItem* aItem,
                                       StyleGeometryBox aClip,
                                       const nsRect& aRect,

layout/xul/nsImageBoxFrame.h

@@ -155,6 +155,10 @@ public:
                                        nsDisplayListBuilder* aBuilder) override;
   virtual already_AddRefed<imgIContainer> GetImage() override;
   virtual nsRect GetDestRect() const override;
+  virtual void UpdateDrawResult(mozilla::image::ImgDrawResult aResult) override
+  {
+    nsDisplayItemGenericImageGeometry::UpdateDrawResult(this, aResult);
+  }
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
                            bool* aSnap) const override
   {