| Index: cc/CCSharedQuadState.h
|
| diff --git a/cc/CCSharedQuadState.h b/cc/CCSharedQuadState.h
|
| index f4f9726644e76039932404fa653689483e888ab5..0f5e386410d599588d644bbf42f78912e8d1bef3 100644
|
| --- a/cc/CCSharedQuadState.h
|
| +++ b/cc/CCSharedQuadState.h
|
| @@ -6,8 +6,8 @@
|
| #define CCSharedQuadState_h
|
|
|
| #include "IntRect.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include <public/WebTransformationMatrix.h>
|
| -#include <wtf/PassOwnPtr.h>
|
|
|
| namespace cc {
|
|
|
| @@ -22,10 +22,10 @@ struct CCSharedQuadState {
|
| float opacity;
|
| bool opaque;
|
|
|
| - static PassOwnPtr<CCSharedQuadState> create(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);
|
|
|
| - PassOwnPtr<CCSharedQuadState> copy() const;
|
| + scoped_ptr<CCSharedQuadState> copy() const;
|
| };
|
|
|
| }
|
|
|