summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-13 11:33:07 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-13 11:33:07 +0000
commit42cfd6ea4e6d447e55d0128399c6ab0dfd418e8f (patch)
treeb68261db4c1d11ebd2c8bc6865b3ed679e07bb75 /cc/test
parentb9d4bfd6cccb715a3e013e4f6cd3e8628655a4a3 (diff)
downloadchromium_src-42cfd6ea4e6d447e55d0128399c6ab0dfd418e8f.zip
chromium_src-42cfd6ea4e6d447e55d0128399c6ab0dfd418e8f.tar.gz
chromium_src-42cfd6ea4e6d447e55d0128399c6ab0dfd418e8f.tar.bz2
cc: Chromify fake test layers
Some minor changes mostly to remove /^public:/ matches so these don't get listed as being unformatted. R=danakj@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/12413019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/fake_content_layer.cc9
-rw-r--r--cc/test/fake_content_layer.h2
-rw-r--r--cc/test/fake_scrollbar_layer.cc27
-rw-r--r--cc/test/fake_scrollbar_layer.h21
4 files changed, 29 insertions, 30 deletions
diff --git a/cc/test/fake_content_layer.cc b/cc/test/fake_content_layer.cc
index f5c64c1..7aafd9f 100644
--- a/cc/test/fake_content_layer.cc
+++ b/cc/test/fake_content_layer.cc
@@ -12,7 +12,7 @@ namespace cc {
FakeContentLayer::FakeContentLayer(ContentLayerClient* client)
: ContentLayer(client),
update_count_(0) {
- SetAnchorPoint(gfx::PointF(0, 0));
+ SetAnchorPoint(gfx::PointF(0.f, 0.f));
SetBounds(gfx::Size(1, 1));
SetIsDrawable(true);
}
@@ -24,10 +24,9 @@ scoped_ptr<LayerImpl> FakeContentLayer::CreateLayerImpl(
return FakeContentLayerImpl::Create(tree_impl, layer_id_).PassAs<LayerImpl>();
}
-void FakeContentLayer::Update(
- ResourceUpdateQueue* queue,
- const OcclusionTracker* occlusion,
- RenderingStats* stats) {
+void FakeContentLayer::Update(ResourceUpdateQueue* queue,
+ const OcclusionTracker* occlusion,
+ RenderingStats* stats) {
ContentLayer::Update(queue, occlusion, stats);
update_count_++;
}
diff --git a/cc/test/fake_content_layer.h b/cc/test/fake_content_layer.h
index ac67cb9..0b977af 100644
--- a/cc/test/fake_content_layer.h
+++ b/cc/test/fake_content_layer.h
@@ -13,7 +13,7 @@ namespace cc {
class FakeContentLayer : public ContentLayer {
public:
static scoped_refptr<FakeContentLayer> Create(ContentLayerClient* client) {
- return make_scoped_refptr(new FakeContentLayer(client));
+ return make_scoped_refptr(new FakeContentLayer(client));
}
virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
diff --git a/cc/test/fake_scrollbar_layer.cc b/cc/test/fake_scrollbar_layer.cc
index 1700dce..9c24a85 100644
--- a/cc/test/fake_scrollbar_layer.cc
+++ b/cc/test/fake_scrollbar_layer.cc
@@ -11,29 +11,28 @@
namespace cc {
-FakeScrollbarLayer::FakeScrollbarLayer(
- bool paint_during_update, bool has_thumb, int scrolling_layer_id)
- : ScrollbarLayer(
- FakeWebScrollbar::Create().PassAs<WebKit::WebScrollbar>(),
- FakeScrollbarThemePainter::Create(paint_during_update)
- .PassAs<ScrollbarThemePainter>(),
- FakeWebScrollbarThemeGeometry::create(has_thumb)
- .PassAs<WebKit::WebScrollbarThemeGeometry>(),
- scrolling_layer_id),
+FakeScrollbarLayer::FakeScrollbarLayer(bool paint_during_update,
+ bool has_thumb,
+ int scrolling_layer_id)
+ : ScrollbarLayer(FakeWebScrollbar::Create().PassAs<WebKit::WebScrollbar>(),
+ FakeScrollbarThemePainter::Create(paint_during_update).
+ PassAs<ScrollbarThemePainter>(),
+ FakeWebScrollbarThemeGeometry::create(has_thumb).
+ PassAs<WebKit::WebScrollbarThemeGeometry>(),
+ scrolling_layer_id),
update_count_(0),
last_update_full_upload_size_(0),
last_update_partial_upload_size_(0) {
- SetAnchorPoint(gfx::PointF(0, 0));
+ SetAnchorPoint(gfx::PointF(0.f, 0.f));
SetBounds(gfx::Size(1, 1));
SetIsDrawable(true);
}
FakeScrollbarLayer::~FakeScrollbarLayer() {}
-void FakeScrollbarLayer::Update(
- ResourceUpdateQueue* queue,
- const OcclusionTracker* occlusion,
- RenderingStats* stats) {
+void FakeScrollbarLayer::Update(ResourceUpdateQueue* queue,
+ const OcclusionTracker* occlusion,
+ RenderingStats* stats) {
size_t full = queue->fullUploadSize();
size_t partial = queue->partialUploadSize();
ScrollbarLayer::Update(queue, occlusion, stats);
diff --git a/cc/test/fake_scrollbar_layer.h b/cc/test/fake_scrollbar_layer.h
index a6eaa61..95e67f9 100644
--- a/cc/test/fake_scrollbar_layer.h
+++ b/cc/test/fake_scrollbar_layer.h
@@ -11,9 +11,10 @@
namespace cc {
class FakeScrollbarLayer : public ScrollbarLayer {
-public:
- static scoped_refptr<FakeScrollbarLayer> Create(
- bool paint_during_update, bool has_thumb, int scrolling_layer_id) {
+ public:
+ static scoped_refptr<FakeScrollbarLayer> Create(bool paint_during_update,
+ bool has_thumb,
+ int scrolling_layer_id) {
return make_scoped_refptr(new FakeScrollbarLayer(
paint_during_update, has_thumb, scrolling_layer_id));
}
@@ -27,14 +28,14 @@ public:
return last_update_partial_upload_size_;
}
- virtual void Update(
- ResourceUpdateQueue* queue,
- const OcclusionTracker* occlusion,
- RenderingStats* stats) OVERRIDE;
+ virtual void Update(ResourceUpdateQueue* queue,
+ const OcclusionTracker* occlusion,
+ RenderingStats* stats) OVERRIDE;
-private:
- FakeScrollbarLayer(
- bool paint_during_update, bool has_thumb, int scrolling_layer_id);
+ private:
+ FakeScrollbarLayer(bool paint_during_update,
+ bool has_thumb,
+ int scrolling_layer_id);
virtual ~FakeScrollbarLayer();
int update_count_;