summaryrefslogtreecommitdiffstats
path: root/cc/shared_quad_state.h
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 21:22:42 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 21:22:42 +0000
commitc753e25a8b4366c44134a8c21b9ed3392bf48608 (patch)
treef378c8a762caccf60856a1670ae33dfd638b9453 /cc/shared_quad_state.h
parent503160f80568f024fa712e280bb1a4e1e6ca1ec3 (diff)
downloadchromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.zip
chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.gz
chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.bz2
Revert "cc: Rename cc classes and members to match filenames"
This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/shared_quad_state.h')
-rw-r--r--cc/shared_quad_state.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/shared_quad_state.h b/cc/shared_quad_state.h
index 5e17536..0f5e386 100644
--- a/cc/shared_quad_state.h
+++ b/cc/shared_quad_state.h
@@ -11,7 +11,7 @@
namespace cc {
-struct SharedQuadState {
+struct CCSharedQuadState {
int id;
// Transforms from quad's original content space to its target content space.
@@ -22,10 +22,10 @@ struct SharedQuadState {
float opacity;
bool opaque;
- static scoped_ptr<SharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
- SharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
+ static scoped_ptr<CCSharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
+ CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
- scoped_ptr<SharedQuadState> copy() const;
+ scoped_ptr<CCSharedQuadState> copy() const;
};
}