| Index: cc/shared_quad_state.cc
|
| diff --git a/cc/shared_quad_state.cc b/cc/shared_quad_state.cc
|
| index ede07a56736e7ad04dbfe5ea0d2280bd4542e156..577c8eafaccd02e8eefff98f8b7f964d5ea8c91b 100644
|
| --- a/cc/shared_quad_state.cc
|
| +++ b/cc/shared_quad_state.cc
|
| @@ -10,12 +10,12 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<CCSharedQuadState> CCSharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
|
| +scoped_ptr<SharedQuadState> SharedQuadState::create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
|
| {
|
| - return make_scoped_ptr(new CCSharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| + return make_scoped_ptr(new SharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| }
|
|
|
| -CCSharedQuadState::CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
|
| +SharedQuadState::SharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
|
| : id(-1)
|
| , quadTransform(quadTransform)
|
| , visibleContentRect(visibleContentRect)
|
| @@ -25,9 +25,9 @@ CCSharedQuadState::CCSharedQuadState(const WebKit::WebTransformationMatrix& quad
|
| {
|
| }
|
|
|
| -scoped_ptr<CCSharedQuadState> CCSharedQuadState::copy() const
|
| +scoped_ptr<SharedQuadState> SharedQuadState::copy() const
|
| {
|
| - scoped_ptr<CCSharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| + scoped_ptr<SharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| copiedState->id = id;
|
| return copiedState.Pass();
|
| }
|
|
|