Bug 1130681. Part 1: Add unlock back to ClientTiledLayerBuffer for causing emulator R14 intermittent but doesn't seem necessary. r=jrmuizel
authorMason Chang <mchang@mozilla.com>
Fri, 13 Feb 2015 16:36:46 +0800
changeset 228930 9cf76d4021ce9ee02aade9248e0999f43f2d82a3
parent 228929 a7c6bec02690ab181c1968aabe7f920aa6ceeccf
child 228931 984e5db41c439c064b08cc397aa39a8007cb9db5
push id28274
push usercbook@mozilla.com
push dateFri, 13 Feb 2015 16:03:46 +0000
treeherdermozilla-central@8f9d3dabd12e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1130681
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1130681. Part 1: Add unlock back to ClientTiledLayerBuffer for causing emulator R14 intermittent but doesn't seem necessary. r=jrmuizel
gfx/layers/client/TiledContentClient.cpp
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -1280,16 +1280,17 @@ ClientTiledLayerBuffer::ValidateTile(Til
 
   nsIntRegion tileRegion =
     nsIntRect(aTileOrigin.x, aTileOrigin.y,
               GetScaledTileSize().width, GetScaledTileSize().height);
   // Intersect this area with the portion that's invalid.
   tileRegion.SubOut(GetValidRegion());
   tileRegion.SubOut(aDirtyRegion); // Has now been validated
 
+  backBuffer->Unlock();
   backBuffer->SetWaste(tileRegion.Area() * mResolution * mResolution);
 
   if (createdTextureClient) {
     if (!mCompositableClient->AddTextureClient(backBuffer)) {
       NS_WARNING("Failed to add tile TextureClient.");
       aTile.DiscardFrontBuffer();
       aTile.DiscardBackBuffer();
       return aTile;