diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:12:44 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:12:44 +0000 |
commit | a7aa5567e237f78e02defb0dfbe59c7690af5c23 (patch) | |
tree | ec9c2bb73e190560bea3689adaab08f015ea6baa /cc/texture_copier.h | |
parent | 19c1c373edcc11cf28f66e25f02f890815336306 (diff) | |
download | chromium_src-a7aa5567e237f78e02defb0dfbe59c7690af5c23.zip chromium_src-a7aa5567e237f78e02defb0dfbe59c7690af5c23.tar.gz chromium_src-a7aa5567e237f78e02defb0dfbe59c7690af5c23.tar.bz2 |
cc: Remove wtf includes from resource provider
R=jamesr@chromium.org
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11183006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_copier.h')
-rw-r--r-- | cc/texture_copier.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/texture_copier.h b/cc/texture_copier.h index e679805..81feb9c 100644 --- a/cc/texture_copier.h +++ b/cc/texture_copier.h @@ -5,12 +5,12 @@ #ifndef TextureCopier_h #define TextureCopier_h -#include "GraphicsContext3D.h" #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "cc/program_binding.h" #include "cc/shader.h" -#include <wtf/OwnPtr.h> -#include <wtf/PassOwnPtr.h> +#include "GraphicsContext3D.h" +#include "IntSize.h" namespace WebKit { class WebGraphicsContext3D; @@ -37,9 +37,9 @@ public: class AcceleratedTextureCopier : public TextureCopier { public: - static PassOwnPtr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms) + static scoped_ptr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms) { - return adoptPtr(new AcceleratedTextureCopier(context, usingBindUniforms)); + return make_scoped_ptr(new AcceleratedTextureCopier(context, usingBindUniforms)); } virtual ~AcceleratedTextureCopier(); @@ -55,7 +55,7 @@ private: WebKit::WebGraphicsContext3D* m_context; Platform3DObject m_fbo; Platform3DObject m_positionBuffer; - OwnPtr<BlitProgram> m_blitProgram; + scoped_ptr<BlitProgram> m_blitProgram; bool m_usingBindUniforms; DISALLOW_COPY_AND_ASSIGN(AcceleratedTextureCopier); |