cc: Move WebCompositorOutputSurface and related classes into cc/

cc/test/layer_tree_test_common.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/layer_tree_test_common.h"
 
 #include "base/stl_util.h"
 #include "cc/active_animation.h"
 #include "cc/content_layer.h"
 #include "cc/font_atlas.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/scoped_thread_proxy.h"
 #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"
 #include "cc/timing_function.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
 using cc::FontAtlas;
 using cc::InputHandler;
 using cc::Layer;
 using cc::LayerTreeHostImplClient;
 using cc::LayerTreeSettings;
 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 whole namespace to be more
inline with chromium style?

[danakj, 2012/12/04 18:15:34]

I moved the animation test stuff to cc:: so this can go away.

 
-namespace WebKitTests {
+namespace cc {
 
 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFakeWebGraphicsContext3DWithTextureTracking::create(Attributes attrs)
 {
     return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTracking(attrs));
 }
 
 WebGLId CompositorFakeWebGraphicsContext3DWithTextureTracking::createTexture()
 {
     WebGLId texture = m_textures.size() + 1;
     m_textures.push_back(texture);
@@ skipping 30 matching lines @@
 
 CompositorFakeWebGraphicsContext3DWithTextureTracking::~CompositorFakeWebGraphicsContext3DWithTextureTracking()
 {
 }
 
 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)
 {
     return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client, proxy));
 }
 
 void MockLayerTreeHostImpl::beginCommit()
 {
     LayerTreeHostImpl::beginCommit();
@@ skipping 117 matching lines @@
     virtual void layout() OVERRIDE
     {
         m_testHooks->layout();
     }
 
   virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float scale) OVERRIDE
     {
         m_testHooks->applyScrollAndScale(scrollDelta, scale);
     }
 
-    virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRIDE
+    virtual scoped_ptr<OutputSurface> createOutputSurface() OVERRIDE
     {
         return m_testHooks->createOutputSurface();
     }
 
     virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE
     {
         m_testHooks->didRecreateOutputSurface(succeeded);
     }
 
     virtual scoped_ptr<InputHandler> createInputHandler() OVERRIDE
@@ skipping 289 matching lines @@
 
     ASSERT_FALSE(m_layerTreeHost.get());
     m_client.reset();
     if (m_timedOut) {
         FAIL() << "Test timed out";
         return;
     }
     afterTest();
 }
 
-}  // namespace WebKitTests
+}  // namespace cc