summaryrefslogtreecommitdiffstats
path: root/cc/test/tiled_layer_test_common.h
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-28 03:53:29 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-28 03:53:29 +0000
commitb3b5d0affe4c58208decd4a327812e202510a9e9 (patch)
tree45c0bce01a599f5e1221251302f492f48ac91d07 /cc/test/tiled_layer_test_common.h
parent67ea507fbee5b2d1647f3b86a60c36e8ba40c797 (diff)
downloadchromium_src-b3b5d0affe4c58208decd4a327812e202510a9e9.zip
chromium_src-b3b5d0affe4c58208decd4a327812e202510a9e9.tar.gz
chromium_src-b3b5d0affe4c58208decd4a327812e202510a9e9.tar.bz2
Revert 191086 "cc: Switch RenderingStats collection in Layer::Up..."
Looks like its DCHECKing on Win Aura interactive_ui_tests again. Same error as before. http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%20Aura%20Tests%20%283%29&number=2148 > 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 TBR=egraether@chromium.org Review URL: https://codereview.chromium.org/13145002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/tiled_layer_test_common.h')
-rw-r--r--cc/test/tiled_layer_test_common.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 9e84e6e..11666d3 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -32,7 +32,8 @@ class FakeLayerUpdater : public LayerUpdater {
virtual void Update(ResourceUpdateQueue* queue,
gfx::Rect source_rect,
gfx::Vector2d dest_offset,
- bool partial_update) OVERRIDE;
+ bool partial_update,
+ RenderingStats* stats) OVERRIDE;
private:
FakeLayerUpdater* layer_;
@@ -50,7 +51,8 @@ class FakeLayerUpdater : public LayerUpdater {
gfx::Size tile_size,
float contents_width_scale,
float contents_height_scale,
- gfx::Rect* resulting_opaque_rect) OVERRIDE;
+ gfx::Rect* resulting_opaque_rect,
+ RenderingStats* stats) 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);