Backed out changeset e1bb91f60697 (bug 1129871)

iaxat · Feb 17, 2015 · 03428f5 · 03428f5
1 parent 1d8ab3c
commit 03428f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/gfx/layers/TiledLayerBuffer.h b/gfx/layers/TiledLayerBuffer.h
@@ -528,7 +528,7 @@ TiledLayerBuffer<Derived, Tile>::Update(const nsIntRegion& newValidRegion,
                  static_cast<unsigned>(index) < newRetainedTiles.Length(),
                  "index out of range");
 
-      Tile& newTile = newRetainedTiles[index];
+      Tile newTile = newRetainedTiles[index];
 
       // Try to reuse a tile from the old retained tiles that had no partially
       // valid content.
@@ -550,6 +550,8 @@ TiledLayerBuffer<Derived, Tile>::Update(const nsIntRegion& newValidRegion,
 #ifdef GFX_TILEDLAYER_PREF_WARNINGS
       printf_stderr("Store Validate tile %i, %i -> %i\n", tileStartX, tileStartY, index);
 #endif
+      newRetainedTiles[index] = newTile;
+
       y += height;
     }
 

diff --git a/gfx/tests/gtest/TestTiledLayerBuffer.cpp b/gfx/tests/gtest/TestTiledLayerBuffer.cpp
@@ -36,11 +36,11 @@ class TestTiledLayerBuffer : public TiledLayerBuffer<TestTiledLayerBuffer, TestT
     return TestTiledLayerTile(-1);
   }
 
-  void ValidateTile(TestTiledLayerTile& aTile, const nsIntPoint& aTileOrigin, const nsIntRegion& aDirtyRect) {
-    aTile = TestTiledLayerTile();
+  TestTiledLayerTile ValidateTile(TestTiledLayerTile aTile, const nsIntPoint& aTileOrigin, const nsIntRegion& aDirtyRect) {
+    return TestTiledLayerTile();
   }
 
-  void ReleaseTile(TestTiledLayerTile& aTile)
+  void ReleaseTile(TestTiledLayerTile aTile)
   {
 
   }
@@ -57,7 +57,7 @@ class TestTiledLayerBuffer : public TiledLayerBuffer<TestTiledLayerBuffer, TestT
     Update(aNewValidRegion, aPaintRegion);
   }
 
-  void UnlockTile(TestTiledLayerTile& aTile) {}
+  void UnlockTile(TestTiledLayerTile aTile) {}
   void PostValidate(const nsIntRegion& aPaintRegion) {}
 };