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

Bug 539356 - Part 20 - Simplify regions to avoid excessive region calculation. r=roc

Browse Source
This commit is contained in:
Oleg Romashin 2012-08-29 17:48:43 +12:00
parent e084d5ff7f
commit 67b104cbd1
8 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/LayerTreeInvalidation.cpp
View File

@ -117,7 +117,7 @@ struct LayerPropertiesBase : public LayerProperties
}
result = result.Union(ComputeChangeInternal(aCallback));
result = result.Union(TransformRect(mLayer->GetInvalidRect(), mTransform));
result = result.Union(TransformRect(mLayer->GetInvalidRegion().GetBounds(), mTransform));
if (mMaskLayer && otherMask) {
nsIntRect maskDiff = mMaskLayer->ComputeChange(aCallback);

10
gfx/layers/Layers.h
View File

@ -961,23 +961,23 @@ public:
* Returns the current area of the layer (in layer-space coordinates)
* marked as needed to be recomposited.
*/
const nsIntRect& GetInvalidRect() { return mInvalidRect; }
const nsIntRegion& GetInvalidRegion() { return mInvalidRegion; }
/**
* Mark the entirety of the layer's visible region as being invalid.
*/
void SetInvalidRectToVisibleRegion() { mInvalidRect = GetVisibleRegion().GetBounds(); }
void SetInvalidRectToVisibleRegion() { mInvalidRegion = GetVisibleRegion(); }
/**
* Adds to the current invalid rect.
*/
void AddInvalidRect(const nsIntRect& aRect) { mInvalidRect = mInvalidRect.Union(aRect); }
void AddInvalidRect(const nsIntRect& aRect) { mInvalidRegion.Or(mInvalidRegion, aRect); }
/**
* Clear the invalid rect, marking the layer as being identical to what is currently
* composited.
*/
void ClearInvalidRect() { mInvalidRect.SetEmpty(); }
void ClearInvalidRect() { mInvalidRegion.SetEmpty(); }
#ifdef DEBUG
@ -1041,7 +1041,7 @@ protected:
float mOpacity;
nsIntRect mClipRect;
nsIntRect mTileSourceRect;
nsIntRect mInvalidRect;
nsIntRegion mInvalidRegion;
uint32_t mContentFlags;
bool mUseClipRect;
bool mUseTileSourceRect;

5
gfx/layers/basic/BasicThebesLayer.h
View File

@ -37,8 +37,9 @@ public:
{
NS_ASSERTION(BasicManager()->InConstruction(),
"Can only set properties in construction phase");
mValidRegion.Sub(mValidRegion, aRegion);
AddInvalidRect(aRegion.GetBounds());
mInvalidRegion.Or(mInvalidRegion, aRegion);
mInvalidRegion.SimplifyOutward(10);
mValidRegion.Sub(mValidRegion, mInvalidRegion);
}
virtual void PaintThebes(gfxContext* aContext,

5
gfx/layers/d3d10/ThebesLayerD3D10.cpp
View File

@ -45,8 +45,9 @@ ThebesLayerD3D10::~ThebesLayerD3D10()
void
ThebesLayerD3D10::InvalidateRegion(const nsIntRegion &aRegion)
{
mValidRegion.Sub(mValidRegion, aRegion);
AddInvalidRect(aRegion.GetBounds());
mInvalidRegion.Or(mInvalidRegion, aRegion);
mInvalidRegion.SimplifyOutward(10);
mValidRegion.Sub(mValidRegion, mInvalidRegion);
}
void ThebesLayerD3D10::CopyRegion(ID3D10Texture2D* aSrc, const nsIntPoint &aSrcOffset,

5
gfx/layers/d3d9/ThebesLayerD3D9.cpp
View File

@ -49,8 +49,9 @@ ThebesLayerD3D9::~ThebesLayerD3D9()
void
ThebesLayerD3D9::InvalidateRegion(const nsIntRegion &aRegion)
{
mValidRegion.Sub(mValidRegion, aRegion);
AddInvalidRect(aRegion.GetBounds());
mInvalidRegion.Or(mInvalidRegion, aRegion);
mInvalidRegion.SimplifyOutward(10);
mValidRegion.Sub(mValidRegion, mInvalidRegion);
}
void

5
gfx/layers/opengl/ThebesLayerOGL.cpp
View File

@ -789,8 +789,9 @@ ThebesLayerOGL::SetVisibleRegion(const nsIntRegion &aRegion)
void
ThebesLayerOGL::InvalidateRegion(const nsIntRegion &aRegion)
{
mValidRegion.Sub(mValidRegion, aRegion);
AddInvalidRect(aRegion.GetBounds());
mInvalidRegion.Or(mInvalidRegion, aRegion);
mInvalidRegion.SimplifyOutward(10);
mValidRegion.Sub(mValidRegion, mInvalidRegion);
}
void

2
layout/base/nsDisplayList.cpp
View File

@ -1092,6 +1092,8 @@ void nsDisplayList::PaintForFrame(nsDisplayListBuilder* aBuilder,
nsIntRect invalid;
if (props) {
invalid = props->ComputeDifferences(root, computeInvalidFunc);
} else if (widgetTransaction) {
LayerProperties::ClearInvalidations(root);
}
if (view) {

2
layout/base/nsPresShell.cpp
View File

@ -5254,6 +5254,8 @@ PresShell::Paint(nsIView* aViewToPaint,
nsIntRect invalid;
if (props) {
invalid = props->ComputeDifferences(layerManager->GetRoot(), computeInvalidFunc);
} else {
LayerProperties::ClearInvalidations(layerManager->GetRoot());
}
if (!invalid.IsEmpty()) {
if (props) {