diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 08:35:04 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-21 08:35:04 +0000 |
| commit | 2384c8a7fbb38a934737021c45167ae272c30c0c (patch) | |
| tree | f21d7f53e56f85ad83a01b89d6e6470e704353c7 /cc | |
| parent | 4968f86e0dada265d6393117927f5fdb83bed707 (diff) | |
| download | chromium_src-2384c8a7fbb38a934737021c45167ae272c30c0c.zip chromium_src-2384c8a7fbb38a934737021c45167ae272c30c0c.tar.gz chromium_src-2384c8a7fbb38a934737021c45167ae272c30c0c.tar.bz2 | |
cc: Chromify FakeContentLayerClient
R=danakj@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/12806010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/layers/picture_layer_impl_unittest.cc | 6 | ||||
| -rw-r--r-- | cc/test/fake_content_layer_client.h | 23 | ||||
| -rw-r--r-- | cc/trees/layer_tree_host_perftest.cc | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index c58d08c..3bf3ce6 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -121,8 +121,8 @@ class TestablePicturePileImpl : public PicturePileImpl { UpdateRecordedRegion(); } - void addDrawRect(const gfx::Rect& rect) { - client_.addDrawRect(rect); + void add_draw_rect(const gfx::Rect& rect) { + client_.add_draw_rect(rect); } protected: @@ -243,7 +243,7 @@ class PictureLayerImplTest : public testing::Test { for (tile_iter = tiles.begin(); tile_iter < tiles.end(); tile_iter++) { gfx::Point tile_center = (*tile_iter)->content_rect().CenterPoint(); gfx::Rect rect(tile_center.x(), tile_center.y(), 1, 1); - active_pile->addDrawRect(rect); + active_pile->add_draw_rect(rect); rects.push_back(SkRect::MakeXYWH(rect.x(), rect.y(), 1, 1)); } // Force re-record with newly injected content diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h index df94680..4cfffa2 100644 --- a/cc/test/fake_content_layer_client.h +++ b/cc/test/fake_content_layer_client.h @@ -14,22 +14,23 @@ namespace cc { class FakeContentLayerClient : public cc::ContentLayerClient { -public: - FakeContentLayerClient(); - virtual ~FakeContentLayerClient(); + public: + FakeContentLayerClient(); + virtual ~FakeContentLayerClient(); - virtual void PaintContents(SkCanvas* canvas, gfx::Rect rect, - gfx::RectF* opaque_rect) OVERRIDE; + virtual void PaintContents(SkCanvas* canvas, + gfx::Rect rect, + gfx::RectF* opaque_rect) OVERRIDE; - void setPaintAllOpaque(bool opaque) { paint_all_opaque_ = opaque; } + void set_paint_all_opaque(bool opaque) { paint_all_opaque_ = opaque; } - void addDrawRect(const gfx::Rect& rect) { draw_rects_.push_back(rect); } + void add_draw_rect(const gfx::Rect& rect) { draw_rects_.push_back(rect); } -private: - typedef std::vector<gfx::Rect> RectVector; + private: + typedef std::vector<gfx::Rect> RectVector; - bool paint_all_opaque_; - RectVector draw_rects_; + bool paint_all_opaque_; + RectVector draw_rects_; }; } // namespace cc diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc index 64cf83f..bd3849e 100644 --- a/cc/trees/layer_tree_host_perftest.cc +++ b/cc/trees/layer_tree_host_perftest.cc @@ -27,7 +27,7 @@ class LayerTreeHostPerfTest : public LayerTreeTest { public: LayerTreeHostPerfTest() : num_draws_(0) { - fake_content_layer_client_.setPaintAllOpaque(true); + fake_content_layer_client_.set_paint_all_opaque(true); } virtual void BeginTest() OVERRIDE { |