summaryrefslogtreecommitdiffstats
path: root/cc/quads
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-01 21:28:02 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-01 21:28:02 +0000
commitf787848ac2338b858d8b8cbb7d4a36675ac54772 (patch)
treedf259e77ab8694b867a9e4e68a8810cc6fda610a /cc/quads
parentcd94f013250641c83eecb708232c17dc2d2037bd (diff)
downloadchromium_src-f787848ac2338b858d8b8cbb7d4a36675ac54772.zip
chromium_src-f787848ac2338b858d8b8cbb7d4a36675ac54772.tar.gz
chromium_src-f787848ac2338b858d8b8cbb7d4a36675ac54772.tar.bz2
cc: Fix most cpplint errors in cc/
There's still 5 more after this that need a closer eye, so will submit separately. R=danakj@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/14694005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197719 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/quads')
-rw-r--r--cc/quads/content_draw_quad_base.h2
-rw-r--r--cc/quads/draw_quad.h12
-rw-r--r--cc/quads/picture_draw_quad.h2
3 files changed, 10 insertions, 6 deletions
diff --git a/cc/quads/content_draw_quad_base.h b/cc/quads/content_draw_quad_base.h
index f91390b..b2c936f 100644
--- a/cc/quads/content_draw_quad_base.h
+++ b/cc/quads/content_draw_quad_base.h
@@ -43,6 +43,6 @@ class CC_EXPORT ContentDrawQuadBase : public DrawQuad {
virtual ~ContentDrawQuadBase();
};
-}
+} // namespace cc
#endif // CC_QUADS_CONTENT_DRAW_QUAD_BASE_H_
diff --git a/cc/quads/draw_quad.h b/cc/quads/draw_quad.h
index 3986880..2073e1d 100644
--- a/cc/quads/draw_quad.h
+++ b/cc/quads/draw_quad.h
@@ -38,8 +38,12 @@ class CC_EXPORT DrawQuad {
const SharedQuadState* copied_shared_quad_state) const;
// TODO(danakj): Chromify or remove these SharedQuadState helpers.
- const gfx::Transform& quadTransform() const { return shared_quad_state->content_to_target_transform; }
- gfx::Rect visibleContentRect() const { return shared_quad_state->visible_content_rect; }
+ const gfx::Transform& quadTransform() const {
+ return shared_quad_state->content_to_target_transform;
+ }
+ gfx::Rect visibleContentRect() const {
+ return shared_quad_state->visible_content_rect;
+ }
gfx::Rect clipRect() const { return shared_quad_state->clip_rect; }
bool isClipped() const { return shared_quad_state->is_clipped; }
float opacity() const { return shared_quad_state->opacity; }
@@ -74,8 +78,8 @@ class CC_EXPORT DrawQuad {
!opaque_rect.Contains(visible_rect);
}
- typedef base::Callback<ResourceProvider::ResourceId(
- ResourceProvider::ResourceId)> ResourceIteratorCallback;
+ typedef ResourceProvider::ResourceId ResourceId;
+ typedef base::Callback<ResourceId(ResourceId)> ResourceIteratorCallback;
virtual void IterateResources(const ResourceIteratorCallback& callback) = 0;
// Is the left edge of this tile aligned with the originating layer's
diff --git a/cc/quads/picture_draw_quad.h b/cc/quads/picture_draw_quad.h
index 847c4f8a..40e8487 100644
--- a/cc/quads/picture_draw_quad.h
+++ b/cc/quads/picture_draw_quad.h
@@ -57,6 +57,6 @@ class CC_EXPORT PictureDrawQuad : public ContentDrawQuadBase {
PictureDrawQuad();
};
-}
+} // namespace cc
#endif // CC_QUADS_PICTURE_DRAW_QUAD_H_