wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 1405060b0c96 (bug 1043426) for failures in async-scrolling/element-1.html

Browse Source
This commit is contained in:
Ed Morley 2014-08-04 14:41:46 +01:00
parent 70fd63dbf8
commit 4018f85639
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/Layers.cpp
View File

@ -1013,7 +1013,7 @@ ContainerLayer::DefaultComputeEffectiveTransforms(const Matrix4x4& aTransformToS
}
}
mUseIntermediateSurface = useIntermediateSurface && !GetEffectiveVisibleRegion().IsEmpty();
mUseIntermediateSurface = useIntermediateSurface;
if (useIntermediateSurface) {
ComputeEffectiveTransformsForChildren(Matrix4x4::From2D(residual));
} else {

7
gfx/layers/composite/ContainerLayerComposite.cpp
View File

@ -401,7 +401,6 @@ RenderLayers(ContainerT* aContainer,
for (size_t i = 0u; i < aContainer->mPrepared->mLayers.Length(); i++) {
PreparedLayer& preparedData = aContainer->mPrepared->mLayers[i];
LayerComposite* layerToRender = preparedData.mLayer;
nsIntRect clipRect = preparedData.mClipRect;
if (layerToRender->HasLayerBeenComposited()) {
// Composer2D will compose this layer so skip GPU composition
@ -503,11 +502,6 @@ ContainerRender(ContainerT* aContainer,
LayerManagerComposite* aManager,
const nsIntRect& aClipRect)
{
nsIntRect visibleRect = aContainer->GetEffectiveVisibleRegion().GetBounds();
if (visibleRect.IsEmpty()) {
return;
}
MOZ_ASSERT(aContainer->mPrepared);
if (aContainer->UseIntermediateSurface()) {
RefPtr<CompositingRenderTarget> surface;
@ -522,6 +516,7 @@ ContainerRender(ContainerT* aContainer,
float opacity = aContainer->GetEffectiveOpacity();
nsIntRect visibleRect = aContainer->GetEffectiveVisibleRegion().GetBounds();
#ifdef MOZ_DUMP_PAINTING
if (gfxUtils::sDumpPainting) {
RefPtr<gfx::DataSourceSurface> surf = surface->Dump(aManager->GetCompositor());

8
gfx/layers/composite/ThebesLayerComposite.cpp
View File

@ -108,12 +108,6 @@ ThebesLayerComposite::GetRenderState()
void
ThebesLayerComposite::RenderLayer(const nsIntRect& aClipRect)
{
const nsIntRegion& visibleRegion = GetEffectiveVisibleRegion();
if (visibleRegion.IsEmpty()) {
return;
}
if (!mBuffer || !mBuffer->IsAttached()) {
return;
}
@ -139,6 +133,8 @@ ThebesLayerComposite::RenderLayer(const nsIntRect& aClipRect)
LayerManagerComposite::AutoAddMaskEffect autoMaskEffect(mMaskLayer, effectChain);
AddBlendModeEffect(effectChain);
const nsIntRegion& visibleRegion = GetEffectiveVisibleRegion();
TiledLayerProperties tiledLayerProps;
if (mRequiresTiledProperties) {
tiledLayerProps.mVisibleRegion = visibleRegion;