Index: cc/test/layer_tree_test_common.cc |
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc |
index ab8d9015d823d2cd811cc26407fe83ec550d0965..fedb819e24ca9eff454ea8c0e6d3d3c3e220c47f 100644 |
--- a/cc/test/layer_tree_test_common.cc |
+++ b/cc/test/layer_tree_test_common.cc |
@@ -17,7 +17,7 @@ |
#include "cc/single_thread_proxy.h" |
#include "cc/thread_impl.h" |
#include "cc/test/animation_test_common.h" |
-#include "cc/test/fake_web_compositor_output_surface.h" |
+#include "cc/test/fake_output_surface.h" |
#include "cc/test/fake_web_graphics_context_3d.h" |
#include "cc/test/occlusion_tracker_test_common.h" |
#include "cc/test/tiled_layer_test_common.h" |
@@ -35,8 +35,9 @@ using cc::Proxy; |
using cc::ScopedThreadProxy; |
using namespace WebKit; |
+using namespace WebKitTests; |
jamesr
2012/12/04 07:06:51
can you using the specific types instead of the wh
danakj
2012/12/04 18:15:34
I moved the animation test stuff to cc:: so this c
|
-namespace WebKitTests { |
+namespace cc { |
scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFakeWebGraphicsContext3DWithTextureTracking::create(Attributes attrs) |
{ |
@@ -87,9 +88,9 @@ bool TestHooks::prepareToDrawOnThread(cc::LayerTreeHostImpl*) |
return true; |
} |
-scoped_ptr<WebCompositorOutputSurface> TestHooks::createOutputSurface() |
+scoped_ptr<OutputSurface> TestHooks::createOutputSurface() |
{ |
- return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3DWithTextureTracking::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<WebKit::WebCompositorOutputSurface>(); |
+ return FakeOutputSurface::Create(CompositorFakeWebGraphicsContext3DWithTextureTracking::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>(); |
} |
scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy) |
@@ -227,7 +228,7 @@ public: |
m_testHooks->applyScrollAndScale(scrollDelta, scale); |
} |
- virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRIDE |
+ virtual scoped_ptr<OutputSurface> createOutputSurface() OVERRIDE |
{ |
return m_testHooks->createOutputSurface(); |
} |
@@ -537,4 +538,4 @@ void ThreadedTest::runTest(bool threaded) |
afterTest(); |
} |
-} // namespace WebKitTests |
+} // namespace cc |