Index: cc/tiled_layer_unittest.cc |
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc |
index 1e0238575fe0bca85e4aa90a1b4fbb06d1c4fb0f..053ebafc824638e3c53742283c4b875d8712aba3 100644 |
--- a/cc/tiled_layer_unittest.cc |
+++ b/cc/tiled_layer_unittest.cc |
@@ -230,9 +230,9 @@ TEST_F(TiledLayerTest, pushOccludedDirtyTiles) |
calcDrawProps(layer); |
updateAndPush(layer, layerImpl); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 20000, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 20000, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
// We should have both tiles on the impl side. |
EXPECT_TRUE(layerImpl->hasResourceIdForTileAt(0, 0)); |
@@ -245,9 +245,9 @@ TEST_F(TiledLayerTest, pushOccludedDirtyTiles) |
calcDrawProps(layer); |
updateAndPush(layer, layerImpl); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 20000 + 2500, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 20000 + 2500, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
// We should still have both tiles, as part of the top tile is still unoccluded. |
EXPECT_TRUE(layerImpl->hasResourceIdForTileAt(0, 0)); |
@@ -467,7 +467,7 @@ TEST_F(TiledLayerTest, pushIdlePaintedOccludedTiles) |
// We should have the prepainted tile on the impl side, but culled it during paint. |
EXPECT_TRUE(layerImpl->hasResourceIdForTileAt(0, 0)); |
- EXPECT_EQ(1, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_EQ(1, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
TEST_F(TiledLayerTest, pushTilesMarkedDirtyDuringPaint) |
@@ -1030,9 +1030,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusion) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(36-3, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 330000, 1); |
- EXPECT_EQ(3, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 330000, 1); |
+ EXPECT_EQ(3, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
layer->fakeLayerUpdater()->clearUpdateCount(); |
layer->setTexturePriorities(m_priorityCalculator); |
@@ -1043,9 +1043,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusion) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(36-2, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 330000 + 340000, 1); |
- EXPECT_EQ(3 + 2, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 330000 + 340000, 1); |
+ EXPECT_EQ(3 + 2, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
layer->fakeLayerUpdater()->clearUpdateCount(); |
layer->setTexturePriorities(m_priorityCalculator); |
@@ -1056,9 +1056,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusion) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(36, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 330000 + 340000 + 360000, 1); |
- EXPECT_EQ(3 + 2, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 330000 + 340000 + 360000, 1); |
+ EXPECT_EQ(3 + 2, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndVisiblityConstraints) |
@@ -1084,9 +1084,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndVisiblityConstraints) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(24-3, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 210000, 1); |
- EXPECT_EQ(3, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 210000, 1); |
+ EXPECT_EQ(3, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
layer->fakeLayerUpdater()->clearUpdateCount(); |
@@ -1100,9 +1100,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndVisiblityConstraints) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(24-6, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 210000 + 180000, 1); |
- EXPECT_EQ(3 + 6, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 210000 + 180000, 1); |
+ EXPECT_EQ(3 + 6, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
layer->fakeLayerUpdater()->clearUpdateCount(); |
@@ -1116,9 +1116,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndVisiblityConstraints) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(24-6, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 210000 + 180000 + 180000, 1); |
- EXPECT_EQ(3 + 6 + 6, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 210000 + 180000 + 180000, 1); |
+ EXPECT_EQ(3 + 6 + 6, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
@@ -1146,9 +1146,9 @@ TEST_F(TiledLayerTest, tilesNotPaintedWithoutInvalidation) |
updateTextures(); |
} |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 330000, 1); |
- EXPECT_EQ(3, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 330000, 1); |
+ EXPECT_EQ(3, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
layer->fakeLayerUpdater()->clearUpdateCount(); |
layer->setTexturePriorities(m_priorityCalculator); |
@@ -1158,9 +1158,9 @@ TEST_F(TiledLayerTest, tilesNotPaintedWithoutInvalidation) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(3, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 330000, 1); |
- EXPECT_EQ(6, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 330000, 1); |
+ EXPECT_EQ(6, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndTransforms) |
@@ -1190,9 +1190,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndTransforms) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(36-3, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 330000, 1); |
- EXPECT_EQ(3, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 330000, 1); |
+ EXPECT_EQ(3, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndScaling) |
@@ -1229,9 +1229,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndScaling) |
// number of tiles 3x3. |
EXPECT_EQ(9, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 90000, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 90000, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
layer->fakeLayerUpdater()->clearUpdateCount(); |
@@ -1247,9 +1247,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndScaling) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(9-1, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 90000 + 80000, 1); |
- EXPECT_EQ(1, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 90000 + 80000, 1); |
+ EXPECT_EQ(1, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
layer->fakeLayerUpdater()->clearUpdateCount(); |
@@ -1270,9 +1270,9 @@ TEST_F(TiledLayerTest, tilesPaintedWithOcclusionAndScaling) |
layer->update(*m_queue.get(), &occluded, NULL); |
EXPECT_EQ(9-1, layer->fakeLayerUpdater()->updateCount()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 90000 + 80000 + 80000, 1); |
- EXPECT_EQ(1 + 1, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 90000 + 80000 + 80000, 1); |
+ EXPECT_EQ(1 + 1, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
TEST_F(TiledLayerTest, visibleContentOpaqueRegion) |
@@ -1304,10 +1304,10 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion) |
opaqueContents = layer->visibleContentOpaqueRegion(); |
EXPECT_TRUE(opaqueContents.IsEmpty()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsPainted(), 20000, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 20000, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_painted(), 20000, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 20000, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
// visibleContentOpaqueRegion should match the visible part of what is painted opaque. |
opaquePaintRect = gfx::Rect(10, 10, 90, 190); |
@@ -1320,10 +1320,10 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion) |
opaqueContents = layer->visibleContentOpaqueRegion(); |
EXPECT_EQ(gfx::IntersectRects(opaquePaintRect, visibleBounds).ToString(), opaqueContents.ToString()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsPainted(), 20000 * 2, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 17100, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 20000 + 20000 - 17100, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_painted(), 20000 * 2, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 17100, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 20000 + 20000 - 17100, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
// If we paint again without invalidating, the same stuff should be opaque. |
layer->fakeLayerUpdater()->setOpaquePaintRect(gfx::Rect()); |
@@ -1334,10 +1334,10 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion) |
opaqueContents = layer->visibleContentOpaqueRegion(); |
EXPECT_EQ(gfx::IntersectRects(opaquePaintRect, visibleBounds).ToString(), opaqueContents.ToString()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsPainted(), 20000 * 2, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 17100, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 20000 + 20000 - 17100, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_painted(), 20000 * 2, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 17100, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 20000 + 20000 - 17100, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
// If we repaint a non-opaque part of the tile, then it shouldn't lose its opaque-ness. And other tiles should |
// not be affected. |
@@ -1350,10 +1350,10 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion) |
opaqueContents = layer->visibleContentOpaqueRegion(); |
EXPECT_EQ(gfx::IntersectRects(opaquePaintRect, visibleBounds).ToString(), opaqueContents.ToString()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsPainted(), 20000 * 2 + 1, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 17100, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 20000 + 20000 - 17100 + 1, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_painted(), 20000 * 2 + 1, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 17100, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 20000 + 20000 - 17100 + 1, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
// If we repaint an opaque part of the tile, then it should lose its opaque-ness. But other tiles should still |
// not be affected. |
@@ -1366,13 +1366,13 @@ TEST_F(TiledLayerTest, visibleContentOpaqueRegion) |
opaqueContents = layer->visibleContentOpaqueRegion(); |
EXPECT_EQ(gfx::IntersectRects(gfx::Rect(10, 100, 90, 100), visibleBounds).ToString(), opaqueContents.ToString()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsPainted(), 20000 * 2 + 1 + 1, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 17100, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 20000 + 20000 - 17100 + 1 + 1, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_painted(), 20000 * 2 + 1 + 1, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 17100, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 20000 + 20000 - 17100 + 1 + 1, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
-TEST_F(TiledLayerTest, pixelsPaintedMetrics) |
+TEST_F(TiledLayerTest, pixels_paintedMetrics) |
{ |
scoped_refptr<FakeTiledLayer> layer = make_scoped_refptr(new FakeTiledLayer(m_resourceManager.get())); |
TestOcclusionTracker occluded; |
@@ -1398,10 +1398,10 @@ TEST_F(TiledLayerTest, pixelsPaintedMetrics) |
opaqueContents = layer->visibleContentOpaqueRegion(); |
EXPECT_TRUE(opaqueContents.IsEmpty()); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsPainted(), 30000, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 30000, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_painted(), 30000, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 30000, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
// Invalidates an area on the top and bottom tile, which will cause us to paint the tile in the middle, |
// even though it is not dirty and will not be uploaded. |
@@ -1416,11 +1416,11 @@ TEST_F(TiledLayerTest, pixelsPaintedMetrics) |
EXPECT_TRUE(opaqueContents.IsEmpty()); |
// The middle tile was painted even though not invalidated. |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsPainted(), 30000 + 60 * 210, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_painted(), 30000 + 60 * 210, 1); |
// The pixels uploaded will not include the non-invalidated tile in the middle. |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedOpaque(), 0, 1); |
- EXPECT_NEAR(occluded.OverdrawMetrics().pixelsUploadedTranslucent(), 30000 + 1 + 100, 1); |
- EXPECT_EQ(0, occluded.OverdrawMetrics().tilesCulledForUpload()); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_opaque(), 0, 1); |
+ EXPECT_NEAR(occluded.OverdrawMetrics().pixels_uploaded_translucent(), 30000 + 1 + 100, 1); |
+ EXPECT_EQ(0, occluded.OverdrawMetrics().tiles_culled_for_upload()); |
} |
TEST_F(TiledLayerTest, dontAllocateContentsWhenTargetSurfaceCantBeAllocated) |