Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 820649ecb0fa (bug 1113435) and changeset 4d049a07f749 (bug 1085223) for Android reftest failures.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-02-17 16:14:50 -05:00
parent 4df1f6609e
commit 907ac22584
4 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/TiledLayerBuffer.h
View File

@ -236,8 +236,6 @@ public:
*/
virtual const nsIntRegion& GetValidLowPrecisionRegion() const = 0;
virtual const nsIntRegion& GetValidRegion() const = 0;
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
/**
* Store a fence that will signal when the current buffer is no longer being read.

18
gfx/layers/composite/LayerManagerComposite.cpp
View File

@ -212,7 +212,6 @@ LayerManagerComposite::ApplyOcclusionCulling(Layer* aLayer, nsIntRegion& aOpaque
}
}
// Subtract any areas that we know to be opaque from our
// visible region.
LayerComposite *composite = aLayer->AsLayerComposite();
@ -234,7 +233,7 @@ LayerManagerComposite::ApplyOcclusionCulling(Layer* aLayer, nsIntRegion& aOpaque
!aLayer->GetMaskLayer() &&
aLayer->GetLocalOpacity() == 1.0f) {
if (aLayer->GetContentFlags() & Layer::CONTENT_OPAQUE) {
localOpaque.Or(localOpaque, composite->GetRenderedVisibleRegion());
localOpaque.Or(localOpaque, composite->GetShadowVisibleRegion());
}
localOpaque.MoveBy(transform2d._31, transform2d._32);
const nsIntRect* clip = aLayer->GetEffectiveClipRect();
@ -305,8 +304,11 @@ LayerManagerComposite::EndTransaction(DrawPaintedLayerCallback aCallback,
// so we don't need to pass any global transform here.
mRoot->ComputeEffectiveTransforms(gfx::Matrix4x4());
nsIntRegion opaque;
ApplyOcclusionCulling(mRoot, opaque);
// Disable culling for now. We need to fix /the regressions from
// bug 1085223 before we can re-enable this:
// 1) Don't cull during progressive draw, 2) OS X tp5 regressions.
//nsIntRegion opaque;
//ApplyOcclusionCulling(mRoot, opaque);
Render();
mGeometryChanged = false;
@ -1152,14 +1154,6 @@ LayerComposite::SetLayerManager(LayerManagerComposite* aManager)
mCompositor = aManager->GetCompositor();
}
const nsIntRegion&
LayerComposite::GetRenderedVisibleRegion() {
if (TiledLayerComposer* tiled = GetTiledLayerComposer()) {
return tiled->GetValidRegion();
}
return GetShadowVisibleRegion();
}
#ifndef MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS
/*static*/ bool

7
gfx/layers/composite/LayerManagerComposite.h
View File

@ -441,13 +441,6 @@ public:
bool HasLayerBeenComposited() { return mLayerComposited; }
nsIntRect GetClearRect() { return mClearRect; }
/**
* Return the part of the visible region that has been rendered.
* While progressive drawing is in progress this region will be
* a subset of the shadow visible region.
*/
const nsIntRegion& GetRenderedVisibleRegion();
protected:
gfx::Matrix4x4 mShadowTransform;
nsIntRegion mShadowVisibleRegion;

5
gfx/layers/composite/TiledContentHost.h
View File

@ -231,11 +231,6 @@ public:
return mLowPrecisionTiledBuffer.GetValidRegion();
}
const nsIntRegion& GetValidRegion() const MOZ_OVERRIDE
{
return mTiledBuffer.GetValidRegion();
}
virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE
{
CompositableHost::SetCompositor(aCompositor);