summaryrefslogtreecommitdiffstats
path: root/cc/layers/content_layer_unittest.cc
diff options
context:
space:
mode:
authoregraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 02:31:03 +0000
committeregraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 02:31:03 +0000
commit944314aa4ab8aa1dbba22a6dbdcfdf96cce20352 (patch)
treeccf648588bf8e3694f536290e95dbf1c646d8aff /cc/layers/content_layer_unittest.cc
parentd461f62c56a00d085fab0072182658a1278eec4d (diff)
downloadchromium_src-944314aa4ab8aa1dbba22a6dbdcfdf96cce20352.zip
chromium_src-944314aa4ab8aa1dbba22a6dbdcfdf96cce20352.tar.gz
chromium_src-944314aa4ab8aa1dbba22a6dbdcfdf96cce20352.tar.bz2
cc: Switch RenderingStats collection in Layer::Update() to RenderingStatsInstrumentation
This change switches all of the remaining RenderingStats collection in composited mode to use RenderinStatsInstrumentation. BUG=181319 Review URL: https://chromiumcodereview.appspot.com/12426024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/content_layer_unittest.cc')
-rw-r--r--cc/layers/content_layer_unittest.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/cc/layers/content_layer_unittest.cc b/cc/layers/content_layer_unittest.cc
index 25421e7..b1c6a11 100644
--- a/cc/layers/content_layer_unittest.cc
+++ b/cc/layers/content_layer_unittest.cc
@@ -6,6 +6,7 @@
#include "cc/layers/content_layer_client.h"
#include "cc/resources/bitmap_content_layer_updater.h"
+#include "cc/test/fake_rendering_stats_instrumentation.h"
#include "cc/test/geometry_test_utils.h"
#include "skia/ext/platform_canvas.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -37,17 +38,18 @@ TEST(ContentLayerTest, ContentLayerPainterWithDeviceScale) {
gfx::RectF opaque_rect_in_content_space = gfx::ScaleRect(
opaque_rect_in_layer_space, contents_scale, contents_scale);
MockContentLayerClient client(opaque_rect_in_layer_space);
+ FakeRenderingStatsInstrumentation stats_instrumentation;
scoped_refptr<BitmapContentLayerUpdater> updater =
- BitmapContentLayerUpdater::Create(ContentLayerPainter::Create(&client).
- PassAs<LayerPainter>());
+ BitmapContentLayerUpdater::Create(
+ ContentLayerPainter::Create(&client).PassAs<LayerPainter>(),
+ &stats_instrumentation);
gfx::Rect resulting_opaque_rect;
updater->PrepareToUpdate(content_rect,
gfx::Size(256, 256),
contents_scale,
contents_scale,
- &resulting_opaque_rect,
- NULL);
+ &resulting_opaque_rect);
EXPECT_RECT_EQ(gfx::ToEnclosingRect(opaque_rect_in_content_space),
resulting_opaque_rect);