diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
| commit | c753e25a8b4366c44134a8c21b9ed3392bf48608 (patch) | |
| tree | f378c8a762caccf60856a1670ae33dfd638b9453 /cc/shared_quad_state.cc | |
| parent | 503160f80568f024fa712e280bb1a4e1e6ca1ec3 (diff) | |
| download | chromium_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.cc')
| -rw-r--r-- | cc/shared_quad_state.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/shared_quad_state.cc b/cc/shared_quad_state.cc index be28795..926cd7eb 100644 --- a/cc/shared_quad_state.cc +++ b/cc/shared_quad_state.cc @@ -10,12 +10,12 @@ namespace cc { -scoped_ptr<SharedQuadState> SharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque) +scoped_ptr<CCSharedQuadState> CCSharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque) { - return make_scoped_ptr(new SharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque)); + return make_scoped_ptr(new CCSharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque)); } -SharedQuadState::SharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque) +CCSharedQuadState::CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque) : id(-1) , quadTransform(quadTransform) , visibleContentRect(visibleContentRect) @@ -25,9 +25,9 @@ SharedQuadState::SharedQuadState(const WebKit::WebTransformationMatrix& quadTran { } -scoped_ptr<SharedQuadState> SharedQuadState::copy() const +scoped_ptr<CCSharedQuadState> CCSharedQuadState::copy() const { - scoped_ptr<SharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque)); + scoped_ptr<CCSharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque)); copiedState->id = id; return copiedState.Pass(); } |