| Index: cc/CCRenderPass.h
|
| diff --git a/cc/CCRenderPass.h b/cc/CCRenderPass.h
|
| index 4cafa613c97c2d3dd3d4d767340ff8fc81502e07..a6c925298c5d70f02fc76de6b2047b25e2f0a6a0 100644
|
| --- a/cc/CCRenderPass.h
|
| +++ b/cc/CCRenderPass.h
|
| @@ -11,8 +11,8 @@
|
| #include "FloatRect.h"
|
| #include "SkColor.h"
|
| #include "cc/hash_pair.h"
|
| -#include "cc/own_ptr_vector.h"
|
| #include "cc/scoped_ptr_hash_map.h"
|
| +#include "cc/scoped_ptr_vector.h"
|
| #include <public/WebFilterOperations.h>
|
| #include <public/WebTransformationMatrix.h>
|
| #include <wtf/Vector.h>
|
| @@ -25,7 +25,7 @@ class CCRenderSurface;
|
| struct CCAppendQuadsData;
|
|
|
| // A list of CCDrawQuad objects, sorted internally in front-to-back order.
|
| -class CCQuadList : public OwnPtrVector<CCDrawQuad> {
|
| +class CCQuadList : public ScopedPtrVector<CCDrawQuad> {
|
| public:
|
| typedef reverse_iterator backToFrontIterator;
|
| typedef const_reverse_iterator constBackToFrontIterator;
|
| @@ -36,7 +36,7 @@ public:
|
| inline constBackToFrontIterator backToFrontEnd() const { return rend(); }
|
| };
|
|
|
| -typedef OwnPtrVector<CCSharedQuadState> CCSharedQuadStateList;
|
| +typedef ScopedPtrVector<CCSharedQuadState> CCSharedQuadStateList;
|
|
|
| class CCRenderPass {
|
| WTF_MAKE_NONCOPYABLE(CCRenderPass);
|
|
|