| Index: cc/CCSharedQuadState.cpp
|
| diff --git a/cc/CCSharedQuadState.cpp b/cc/CCSharedQuadState.cpp
|
| index 65fe2f0ff29cc8c14e1a516cf7309920440b35e6..7aca0eccb7edaf376a67682fa7e24574e70f04f5 100644
|
| --- a/cc/CCSharedQuadState.cpp
|
| +++ b/cc/CCSharedQuadState.cpp
|
| @@ -10,9 +10,9 @@
|
|
|
| namespace cc {
|
|
|
| -PassOwnPtr<CCSharedQuadState> CCSharedQuadState::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 adoptPtr(new CCSharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| + return scoped_ptr<CCSharedQuadState>(new CCSharedQuadState(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| }
|
|
|
| CCSharedQuadState::CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque)
|
| @@ -25,11 +25,11 @@ CCSharedQuadState::CCSharedQuadState(const WebKit::WebTransformationMatrix& quad
|
| {
|
| }
|
|
|
| -PassOwnPtr<CCSharedQuadState> CCSharedQuadState::copy() const
|
| +scoped_ptr<CCSharedQuadState> CCSharedQuadState::copy() const
|
| {
|
| - OwnPtr<CCSharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| + scoped_ptr<CCSharedQuadState> copiedState(create(quadTransform, visibleContentRect, clippedRectInTarget, opacity, opaque));
|
| copiedState->id = id;
|
| - return copiedState.release();
|
| + return copiedState.Pass();
|
| }
|
|
|
| }
|
|
|