From 9d4f41f8736543f85752ea4a8f8d0fb709c1eb1c Mon Sep 17 00:00:00 2001 From: "egraether@chromium.org" Date: Thu, 28 Mar 2013 01:34:23 +0000 Subject: 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@191086 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/test/fake_content_layer.cc | 5 ++--- cc/test/fake_content_layer.h | 3 +-- cc/test/fake_scrollbar_layer.cc | 5 ++--- cc/test/fake_scrollbar_layer.h | 3 +-- cc/test/tiled_layer_test_common.cc | 6 ++---- cc/test/tiled_layer_test_common.h | 6 ++---- 6 files changed, 10 insertions(+), 18 deletions(-) (limited to 'cc/test') diff --git a/cc/test/fake_content_layer.cc b/cc/test/fake_content_layer.cc index 384521c..a30ea95 100644 --- a/cc/test/fake_content_layer.cc +++ b/cc/test/fake_content_layer.cc @@ -25,9 +25,8 @@ scoped_ptr FakeContentLayer::CreateLayerImpl( } void FakeContentLayer::Update(ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion, - RenderingStats* stats) { - ContentLayer::Update(queue, occlusion, stats); + const OcclusionTracker* occlusion) { + ContentLayer::Update(queue, occlusion); update_count_++; } diff --git a/cc/test/fake_content_layer.h b/cc/test/fake_content_layer.h index 52fea8f..cf8066a 100644 --- a/cc/test/fake_content_layer.h +++ b/cc/test/fake_content_layer.h @@ -24,8 +24,7 @@ class FakeContentLayer : public ContentLayer { virtual void Update( ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion, - RenderingStats* stats) OVERRIDE; + const OcclusionTracker* occlusion) OVERRIDE; bool HaveBackingAt(int i, int j); diff --git a/cc/test/fake_scrollbar_layer.cc b/cc/test/fake_scrollbar_layer.cc index 96fbeec..457a5d1 100644 --- a/cc/test/fake_scrollbar_layer.cc +++ b/cc/test/fake_scrollbar_layer.cc @@ -31,11 +31,10 @@ FakeScrollbarLayer::FakeScrollbarLayer(bool paint_during_update, FakeScrollbarLayer::~FakeScrollbarLayer() {} void FakeScrollbarLayer::Update(ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion, - RenderingStats* stats) { + const OcclusionTracker* occlusion) { size_t full = queue->FullUploadSize(); size_t partial = queue->PartialUploadSize(); - ScrollbarLayer::Update(queue, occlusion, stats); + ScrollbarLayer::Update(queue, occlusion); update_count_++; last_update_full_upload_size_ = queue->FullUploadSize() - full; last_update_partial_upload_size_ = queue->PartialUploadSize() - partial; diff --git a/cc/test/fake_scrollbar_layer.h b/cc/test/fake_scrollbar_layer.h index f06f752..8d0d624 100644 --- a/cc/test/fake_scrollbar_layer.h +++ b/cc/test/fake_scrollbar_layer.h @@ -29,8 +29,7 @@ class FakeScrollbarLayer : public ScrollbarLayer { } virtual void Update(ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion, - RenderingStats* stats) OVERRIDE; + const OcclusionTracker* occlusion) OVERRIDE; private: FakeScrollbarLayer(bool paint_during_update, diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc index ce3d365..ece1ec6 100644 --- a/cc/test/tiled_layer_test_common.cc +++ b/cc/test/tiled_layer_test_common.cc @@ -18,8 +18,7 @@ FakeLayerUpdater::Resource::~Resource() {} void FakeLayerUpdater::Resource::Update(ResourceUpdateQueue* queue, gfx::Rect source_rect, gfx::Vector2d dest_offset, - bool partial_update, - RenderingStats* stats) { + bool partial_update) { const gfx::Rect kRect(0, 0, 10, 10); ResourceUpdate upload = ResourceUpdate::Create( texture(), &bitmap_, kRect, kRect, gfx::Vector2d()); @@ -39,8 +38,7 @@ void FakeLayerUpdater::PrepareToUpdate(gfx::Rect content_rect, gfx::Size tile_size, float contents_width_scale, float contents_height_scale, - gfx::Rect* resulting_opaque_rect, - RenderingStats* stats) { + gfx::Rect* resulting_opaque_rect) { prepare_count_++; last_update_rect_ = content_rect; if (!rect_to_invalidate_.IsEmpty()) { diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h index 11666d3..9e84e6e 100644 --- a/cc/test/tiled_layer_test_common.h +++ b/cc/test/tiled_layer_test_common.h @@ -32,8 +32,7 @@ class FakeLayerUpdater : public LayerUpdater { virtual void Update(ResourceUpdateQueue* queue, gfx::Rect source_rect, gfx::Vector2d dest_offset, - bool partial_update, - RenderingStats* stats) OVERRIDE; + bool partial_update) OVERRIDE; private: FakeLayerUpdater* layer_; @@ -51,8 +50,7 @@ class FakeLayerUpdater : public LayerUpdater { gfx::Size tile_size, float contents_width_scale, float contents_height_scale, - gfx::Rect* resulting_opaque_rect, - RenderingStats* stats) OVERRIDE; + gfx::Rect* resulting_opaque_rect) OVERRIDE; // Sets the rect to invalidate during the next call to PrepareToUpdate(). // After the next call to PrepareToUpdate() the rect is reset. void SetRectToInvalidate(gfx::Rect rect, FakeTiledLayer* layer); -- cgit v1.1