Bug 539356 - Revert LayerTreeInvalidation changes to detect Image changes, landed on a CLOSED TREE. r=roc

This commit is contained in:
Matt Woodrow 2012-09-29 01:12:59 +12:00
parent 7e3df0fdae
commit 5abb9407ff
2 changed files with 2 additions and 16 deletions

View File

@ -244,12 +244,6 @@ struct ImageLayerProperties : public LayerPropertiesBase
, mScaleToSize(aImage->GetScaleToSize())
, mScaleMode(aImage->GetScaleMode())
{
AutoLockImage image(mContainer);
if (image.GetImage()) {
mImageSerial = image.GetImage()->GetSerial();
} else {
mImageSerial = 0;
}
}
virtual nsIntRect ComputeChangeInternal(NotifySubDocInvalidationFunc aCallback)
@ -262,17 +256,10 @@ struct ImageLayerProperties : public LayerPropertiesBase
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();
}
@ -284,7 +271,6 @@ struct ImageLayerProperties : public LayerPropertiesBase
gfxPattern::GraphicsFilter mFilter;
gfxIntSize mScaleToSize;
ImageLayer::ScaleMode mScaleMode;
int32_t mImageSerial;
};
LayerPropertiesBase*

View File

@ -31,4 +31,4 @@ 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