зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1129871 - Favor passing tiles by ref rather than copy part 1. r=BenWa
This commit is contained in:
Родитель
62064bcb83
Коммит
0e7c4b0468
|
@ -544,7 +544,7 @@ TiledLayerBuffer<Derived, Tile>::Update(const nsIntRegion& newValidRegion,
|
|||
// in which case it's up to the derived class's ValidateTile()
|
||||
// implementation to allocate a new tile before drawing
|
||||
nsIntPoint tileOrigin(tileStartX, tileStartY);
|
||||
newTile = AsDerived().ValidateTile(newTile, nsIntPoint(tileStartX, tileStartY),
|
||||
AsDerived().ValidateTile(newTile, nsIntPoint(tileStartX, tileStartY),
|
||||
tileDrawRegion);
|
||||
NS_ASSERTION(!newTile.IsPlaceholderTile(), "Unexpected placeholder tile - failed to allocate?");
|
||||
#ifdef GFX_TILEDLAYER_PREF_WARNINGS
|
||||
|
|
|
@ -1059,7 +1059,7 @@ ClientTiledLayerBuffer::PostValidate(const nsIntRegion& aPaintRegion)
|
|||
}
|
||||
|
||||
void
|
||||
ClientTiledLayerBuffer::UnlockTile(TileClient aTile)
|
||||
ClientTiledLayerBuffer::UnlockTile(TileClient& aTile)
|
||||
{
|
||||
// We locked the back buffer, and flipped so we now need to unlock the front
|
||||
if (aTile.mFrontBuffer && aTile.mFrontBuffer->IsLocked()) {
|
||||
|
@ -1078,8 +1078,8 @@ ClientTiledLayerBuffer::UnlockTile(TileClient aTile)
|
|||
}
|
||||
}
|
||||
|
||||
TileClient
|
||||
ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
|
||||
void
|
||||
ClientTiledLayerBuffer::ValidateTile(TileClient& aTile,
|
||||
const nsIntPoint& aTileOrigin,
|
||||
const nsIntRegion& aDirtyRegion)
|
||||
{
|
||||
|
@ -1120,27 +1120,24 @@ ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
|
|||
|
||||
if (!backBuffer) {
|
||||
NS_WARNING("Failed to allocate a tile TextureClient");
|
||||
aTile.DiscardBackBuffer();
|
||||
aTile.DiscardFrontBuffer();
|
||||
return TileClient();
|
||||
aTile.Release();
|
||||
return;
|
||||
}
|
||||
|
||||
// the back buffer may have been already locked in ValidateBackBufferFromFront
|
||||
if (!backBuffer->IsLocked()) {
|
||||
if (!backBuffer->Lock(OpenMode::OPEN_READ_WRITE)) {
|
||||
NS_WARNING("Failed to lock a tile TextureClient");
|
||||
aTile.DiscardBackBuffer();
|
||||
aTile.DiscardFrontBuffer();
|
||||
return TileClient();
|
||||
aTile.Release();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (backBufferOnWhite && !backBufferOnWhite->IsLocked()) {
|
||||
if (!backBufferOnWhite->Lock(OpenMode::OPEN_READ_WRITE)) {
|
||||
NS_WARNING("Failed to lock tile TextureClient for updating.");
|
||||
aTile.DiscardBackBuffer();
|
||||
aTile.DiscardFrontBuffer();
|
||||
return TileClient();
|
||||
aTile.Release();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1148,15 +1145,13 @@ ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
|
|||
if (createdTextureClient) {
|
||||
if (!mCompositableClient->AddTextureClient(backBuffer)) {
|
||||
NS_WARNING("Failed to add tile TextureClient.");
|
||||
aTile.DiscardFrontBuffer();
|
||||
aTile.DiscardBackBuffer();
|
||||
return aTile;
|
||||
aTile.Release();
|
||||
return;
|
||||
}
|
||||
if (backBufferOnWhite && !mCompositableClient->AddTextureClient(backBufferOnWhite)) {
|
||||
NS_WARNING("Failed to add tile TextureClient.");
|
||||
aTile.DiscardFrontBuffer();
|
||||
aTile.DiscardBackBuffer();
|
||||
return aTile;
|
||||
aTile.Release();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1172,9 +1167,9 @@ ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
|
|||
}
|
||||
moz2DTile.mTileOrigin = gfx::IntPoint(aTileOrigin.x, aTileOrigin.y);
|
||||
if (!dt || (backBufferOnWhite && !dtOnWhite)) {
|
||||
aTile.DiscardFrontBuffer();
|
||||
aTile.DiscardBackBuffer();
|
||||
return aTile;
|
||||
NS_WARNING("Failed to get a DrawTarget from a tile");
|
||||
aTile.Release();
|
||||
return;
|
||||
}
|
||||
|
||||
mMoz2DTiles.push_back(moz2DTile);
|
||||
|
@ -1207,7 +1202,7 @@ ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
|
|||
|
||||
aTile.Flip();
|
||||
|
||||
return aTile;
|
||||
return;
|
||||
}
|
||||
|
||||
// Single paint buffer case:
|
||||
|
@ -1291,9 +1286,8 @@ ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
|
|||
if (createdTextureClient) {
|
||||
if (!mCompositableClient->AddTextureClient(backBuffer)) {
|
||||
NS_WARNING("Failed to add tile TextureClient.");
|
||||
aTile.DiscardFrontBuffer();
|
||||
aTile.DiscardBackBuffer();
|
||||
return aTile;
|
||||
aTile.Release();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1307,8 +1301,6 @@ ClientTiledLayerBuffer::ValidateTile(TileClient aTile,
|
|||
// TextureClient around unnecessarily, so discard the back-buffer.
|
||||
aTile.DiscardBackBuffer();
|
||||
}
|
||||
|
||||
return aTile;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -440,15 +440,15 @@ public:
|
|||
SurfaceDescriptorTiles GetSurfaceDescriptorTiles();
|
||||
|
||||
protected:
|
||||
TileClient ValidateTile(TileClient aTile,
|
||||
void ValidateTile(TileClient& aTile,
|
||||
const nsIntPoint& aTileRect,
|
||||
const nsIntRegion& dirtyRect);
|
||||
|
||||
void PostValidate(const nsIntRegion& aPaintRegion);
|
||||
|
||||
void UnlockTile(TileClient aTile);
|
||||
void UnlockTile(TileClient& aTile);
|
||||
|
||||
void ReleaseTile(TileClient aTile) { aTile.Release(); }
|
||||
void ReleaseTile(TileClient& aTile) { aTile.Release(); }
|
||||
|
||||
void SwapTiles(TileClient& aTileA, TileClient& aTileB) { std::swap(aTileA, aTileB); }
|
||||
|
||||
|
|
|
@ -168,14 +168,14 @@ TiledLayerBufferComposite::Upload()
|
|||
ClearPaintedRegion();
|
||||
}
|
||||
|
||||
TileHost
|
||||
TiledLayerBufferComposite::ValidateTile(TileHost aTile,
|
||||
void
|
||||
TiledLayerBufferComposite::ValidateTile(TileHost& aTile,
|
||||
const nsIntPoint& aTileOrigin,
|
||||
const nsIntRegion& aDirtyRect)
|
||||
{
|
||||
if (aTile.IsPlaceholderTile()) {
|
||||
NS_WARNING("Placeholder tile encountered in painted region");
|
||||
return aTile;
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef GFX_TILEDLAYER_PREF_WARNINGS
|
||||
|
@ -205,7 +205,6 @@ TiledLayerBufferComposite::ValidateTile(TileHost aTile,
|
|||
printf_stderr("Tile Time to upload %i\n", PR_IntervalNow() - start);
|
||||
}
|
||||
#endif
|
||||
return aTile;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -164,7 +164,7 @@ public:
|
|||
static void RecycleCallback(TextureHost* textureHost, void* aClosure);
|
||||
|
||||
protected:
|
||||
TileHost ValidateTile(TileHost aTile,
|
||||
void ValidateTile(TileHost& aTile,
|
||||
const nsIntPoint& aTileRect,
|
||||
const nsIntRegion& dirtyRect);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче