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 793656 - Fix flickering during progressive tile updates. r=bgirard

Browse Source 
Force a single transaction when the resolution changes and for other updates,
keep stale tiles within the visible region until the transaction is complete.
This commit is contained in:
Chris Lord 2012-09-25 20:13:40 +01:00
parent f6d8de3463
commit abf5767fcd
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gfx/layers/basic/BasicTiledThebesLayer.cpp
View File

@ -240,7 +240,16 @@ BasicTiledThebesLayer::PaintThebes(gfxContext* aContext,
if (regionToPaint.IsEmpty())
return;
if (gfxPlatform::UseProgressiveTilePainting()) {
gfxSize resolution(1, 1);
for (ContainerLayer* parent = GetParent(); parent; parent = parent->GetParent()) {
const FrameMetrics& metrics = parent->GetFrameMetrics();
resolution.width *= metrics.mResolution.width;
resolution.height *= metrics.mResolution.height;
}
// Force immediate tile painting when the layer has changed resolution.
if (gfxPlatform::UseProgressiveTilePainting() &&
mTiledBuffer.GetResolution() == resolution) {
nsIntRegionRectIterator it(regionToPaint);
const nsIntRect* rect = it.Next();
if (!rect)
@ -265,38 +274,20 @@ BasicTiledThebesLayer::PaintThebes(gfxContext* aContext,
// therefore update what we want to paint and ask for a new paint transaction.
regionToPaint.And(regionToPaint, maxPaint);
BasicManager()->SetRepeatTransaction();
// Make sure that tiles that fall outside of the visible region are discarded.
mValidRegion.And(mValidRegion, mVisibleRegion);
}
// We want to continue to retain invalidated tiles that we're about to paint soon
// to prevent them from disapearing while doing progressive paint. However we only
// want to this if they were painted at the same resolution.
gfxSize resolution(1, 1);
for (ContainerLayer* parent = GetParent(); parent; parent = parent->GetParent()) {
const FrameMetrics& metrics = parent->GetFrameMetrics();
resolution.width *= metrics.mResolution.width;
resolution.height *= metrics.mResolution.height;
}
nsIntRegion regionToRetain(mTiledBuffer.GetValidRegion());
if (false && mTiledBuffer.GetResolution() == resolution) {
// Retain stale tiles but keep them marked as invalid in mValidRegion
// so that they will be eventually repainted.
regionToRetain.And(regionToRetain, mVisibleRegion);
regionToRetain.Or(regionToRetain, regionToPaint);
} else {
regionToRetain = mValidRegion;
regionToRetain.Or(regionToRetain, regionToPaint);
mTiledBuffer.SetResolution(resolution);
}
// Paint and keep track of what we refreshed
mTiledBuffer.PaintThebes(this, regionToRetain, regionToPaint, aCallback, aCallbackData);
// Keep track of what we're about to refresh.
mValidRegion.Or(mValidRegion, regionToPaint);
} else {
mTiledBuffer.PaintThebes(this, mVisibleRegion, regionToPaint, aCallback, aCallbackData);
mTiledBuffer.SetResolution(resolution);
mValidRegion = mVisibleRegion;
}
mTiledBuffer.PaintThebes(this, mVisibleRegion, regionToPaint, aCallback, aCallbackData);
mTiledBuffer.ReadLock();
if (aMaskLayer) {
static_cast<BasicImplData*>(aMaskLayer->ImplData())