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/tiled_layer_unittest.cc | |
| 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/tiled_layer_unittest.cc')
| -rw-r--r-- | cc/tiled_layer_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc index 11c4acc..0f45c5a 100644 --- a/cc/tiled_layer_unittest.cc +++ b/cc/tiled_layer_unittest.cc @@ -23,7 +23,6 @@ using namespace cc; using namespace WebKitTests; -using namespace WTF; using WebKit::WebTransformationMatrix; namespace { @@ -64,7 +63,7 @@ public: { textureManagerClearAllMemory(m_textureManager.get(), m_resourceProvider.get()); DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked; - m_resourceProvider.clear(); + m_resourceProvider.reset(); } // Helper classes and functions that set the current thread to be the impl thread @@ -161,7 +160,7 @@ public: public: WebKitTests::WebCompositorInitializer m_compositorInitializer; scoped_ptr<CCGraphicsContext> m_context; - OwnPtr<CCResourceProvider> m_resourceProvider; + scoped_ptr<CCResourceProvider> m_resourceProvider; scoped_ptr<CCTextureUpdateQueue> m_queue; CCRenderingStats m_stats; FakeTextureUploader m_uploader; |