cc: Move WebCompositorOutputSurface and related classes into cc/

ui/compositor/compositor.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
 #define UI_COMPOSITOR_COMPOSITOR_H_
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 42 matching lines @@
   static ContextFactory* GetInstance();
 
   // Sets the global instance. Caller keeps ownership.
   // If this function isn't called (for tests), a "default" factory will be
   // created on the first call of GetInstance.
   static void SetInstance(ContextFactory* instance);
 
   // Creates an output surface for the given compositor. The factory may keep
   // per-compositor data (e.g. a shared context), that needs to be cleaned up
   // by calling RemoveCompositor when the compositor gets destroyed.
-  virtual WebKit::WebCompositorOutputSurface* CreateOutputSurface(
+  virtual cc::OutputSurface* CreateOutputSurface(
       Compositor* compositor) = 0;
 
   // Creates a context used for offscreen rendering. This context can be shared
   // with all compositors.
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() = 0;
 
   // Destroys per-compositor data.
   virtual void RemoveCompositor(Compositor* compositor) = 0;
 };
 
 // The default factory that creates in-process contexts.
 class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
  public:
   DefaultContextFactory();
   virtual ~DefaultContextFactory();
 
   // ContextFactory implementation
-  virtual WebKit::WebCompositorOutputSurface* CreateOutputSurface(
+  virtual cc::OutputSurface* CreateOutputSurface(
       Compositor* compositor) OVERRIDE;
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() OVERRIDE;
   virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
 
   bool Initialize();
 
   void set_share_group(gfx::GLShareGroup* share_group) {
     share_group_ = share_group;
   }
 
@@ skipping 151 matching lines @@
   // Signals swap has aborted (e.g. lost context).
   void OnSwapBuffersAborted();
 
   // LayerTreeHostClient implementation.
   virtual void willBeginFrame() OVERRIDE;
   virtual void didBeginFrame() OVERRIDE;
   virtual void animate(double frameBeginTime) OVERRIDE;
   virtual void layout() OVERRIDE;
   virtual void applyScrollAndScale(gfx::Vector2d scrollDelta,
                                    float pageScale) OVERRIDE;
-  virtual scoped_ptr<WebKit::WebCompositorOutputSurface>
+  virtual scoped_ptr<cc::OutputSurface>
       createOutputSurface() OVERRIDE;
   virtual void didRecreateOutputSurface(bool success) OVERRIDE;
   virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
   virtual void willCommit() OVERRIDE;
   virtual void didCommit() OVERRIDE;
   virtual void didCommitAndDrawFrame() OVERRIDE;
   virtual void didCompleteSwapBuffers() OVERRIDE;
   virtual void scheduleComposite() OVERRIDE;
   virtual scoped_ptr<cc::FontAtlas> createFontAtlas() OVERRIDE;
 
@@ skipping 41 matching lines @@
   bool disable_schedule_composite_;
 
   CompositorLock* compositor_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(Compositor);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_COMPOSITOR_H_