Bug 539356 - Revert LayerTreeInvalidation changes to detect Image changes, landed on a CLOSED TREE. r=roc
authorMatt Woodrow <mwoodrow@mozilla.com>
Sat, 29 Sep 2012 01:12:59 +1200
changeset 108592 385d571499390152fafb9edc7576d4e611863eae
parent 108591 07914b108f91c82f77061ed58391399c7280d1fb
child 108593 84e550d568ce3cfd71eaf051cd9988acd69c998b
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersroc
bugs539356
milestone18.0a1
Bug 539356 - Revert LayerTreeInvalidation changes to detect Image changes, landed on a CLOSED TREE. r=roc
gfx/layers/LayerTreeInvalidation.cpp
layout/reftests/webm-video/reftest.list
--- a/gfx/layers/LayerTreeInvalidation.cpp
+++ b/gfx/layers/LayerTreeInvalidation.cpp
@@ -239,57 +239,43 @@ struct ImageLayerProperties : public Lay
   ImageLayerProperties(ImageLayer* aImage)
     : LayerPropertiesBase(aImage)
     , mVisibleRegion(aImage->GetVisibleRegion())
     , mContainer(aImage->GetContainer())
     , mFilter(aImage->GetFilter())
     , mScaleToSize(aImage->GetScaleToSize())
     , mScaleMode(aImage->GetScaleMode())
   {
-    AutoLockImage image(mContainer);
-    if (image.GetImage()) {
-      mImageSerial = image.GetImage()->GetSerial();
-    } else {
-      mImageSerial = 0;
-    }
   }
 
   virtual nsIntRect ComputeChangeInternal(NotifySubDocInvalidationFunc aCallback)
   {
     ImageLayer* imageLayer = static_cast<ImageLayer*>(mLayer.get());
     
     if (!imageLayer->GetVisibleRegion().IsEqual(mVisibleRegion)) {
       nsIntRect result = NewTransformedBounds();
       result = result.Union(OldTransformedBounds());
       return result;
     }
 
-    AutoLockImage image(mContainer);
-    int32_t serial = 0;
-    if (image.GetImage()) {
-      serial = image.GetImage()->GetSerial();
-    }
-
     if (mContainer != imageLayer->GetContainer() ||
         mFilter != imageLayer->GetFilter() ||
         mScaleToSize != imageLayer->GetScaleToSize() ||
-        mScaleMode != imageLayer->GetScaleMode() ||
-        mImageSerial != serial) {
+        mScaleMode != imageLayer->GetScaleMode()) {
       return NewTransformedBounds();
     }
 
     return nsIntRect();
   }
 
   nsIntRegion mVisibleRegion;
   nsRefPtr<ImageContainer> mContainer;
   gfxPattern::GraphicsFilter mFilter;
   gfxIntSize mScaleToSize;
   ImageLayer::ScaleMode mScaleMode;
-  int32_t mImageSerial;
 };
 
 LayerPropertiesBase*
 CloneLayerTreePropertiesInternal(Layer* aRoot)
 {
   if (!aRoot) {
     return new LayerPropertiesBase();
   }
--- a/layout/reftests/webm-video/reftest.list
+++ b/layout/reftests/webm-video/reftest.list
@@ -26,9 +26,9 @@ skip-if(Android) == poster-5.html poster
 skip-if(Android) == poster-6.html poster-ref-black140x100.html
 skip-if(Android) == poster-7.html poster-ref-red140x100.html
 skip-if(Android) == poster-8.html poster-ref-black140x100.html
 skip-if(Android) == poster-10.html poster-ref-blue125x100.html
 skip-if(Android) == poster-11.html poster-ref-blue140x100.html
 skip-if(Android) == poster-12.html poster-ref-blue140x100.html
 skip-if(Android) == poster-13.html poster-ref-blue400x300.html
 skip-if(Android) == poster-15.html poster-ref-green70x30.html
-== bug686957.html bug686957-ref.html
+skip-if(Android) == bug686957.html bug686957-ref.html