Merge Compositor and CompositorCC

ui/gfx/compositor/compositor_cc.h

Index: ui/gfx/compositor/compositor_cc.h
diff --git a/ui/gfx/compositor/compositor_cc.h b/ui/gfx/compositor/compositor_cc.h
deleted file mode 100644
index 267576fce77e7aeb57cb89bf84ef4fb63e02a8f3..0000000000000000000000000000000000000000
--- a/ui/gfx/compositor/compositor_cc.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// 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_GFX_COMPOSITOR_COMPOSITOR_CC_H_
-#define UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_
-#pragma once
-
-#include "base/compiler_specific.h"
-#include "base/memory/singleton.h"
-#include "base/memory/ref_counted.h"
-#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/size.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebLayer.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebLayerTreeView.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebLayerTreeViewClient.h"
-
-namespace gfx {
-class Rect;
-class GLContext;
-class GLSurface;
-class GLShareGroup;
-}
-
-namespace ui {
-
-class COMPOSITOR_EXPORT SharedResourcesCC
-    : NON_EXPORTED_BASE(public SharedResources) {
- public:
-  static SharedResourcesCC* GetInstance();
-
-  virtual gfx::ScopedMakeCurrent* GetScopedMakeCurrent() OVERRIDE;
-
-  virtual void* GetDisplay() OVERRIDE;
-
-  gfx::GLShareGroup* GetShareGroup();
-
- private:
-  friend struct DefaultSingletonTraits<SharedResourcesCC>;
-
-  SharedResourcesCC();
-  virtual ~SharedResourcesCC();
-
-  bool Initialize();
-  void Destroy();
-
-  bool initialized_;
-
-  scoped_refptr<gfx::GLContext> context_;
-  scoped_refptr<gfx::GLSurface> surface_;
-
-  DISALLOW_COPY_AND_ASSIGN(SharedResourcesCC);
-};
-
-class COMPOSITOR_EXPORT TextureCC : public Texture {
- public:
-  TextureCC();
-
-  // Texture implementation.
-  virtual void SetCanvas(const SkCanvas& canvas,
-                         const gfx::Point& origin,
-                         const gfx::Size& overall_size) OVERRIDE;
-
-  virtual void Draw(const ui::TextureDrawParams& params,
-                    const gfx::Rect& clip_bounds_in_texture) OVERRIDE;
-
-  virtual void Update() = 0;
-  unsigned int texture_id() const { return texture_id_; }
-  bool flipped() const { return flipped_; }
-  const gfx::Size& size() const { return size_; }
-
- protected:
-  unsigned int texture_id_;
-  bool flipped_;
-  gfx::Size size_;
-  DISALLOW_COPY_AND_ASSIGN(TextureCC);
-};
-
-class COMPOSITOR_EXPORT CompositorCC
-    : public Compositor,
-      NON_EXPORTED_BASE(public WebKit::WebLayerTreeViewClient) {
- public:
-  CompositorCC(CompositorDelegate* delegate,
-               gfx::AcceleratedWidget widget,
-               const gfx::Size& size);
-  virtual ~CompositorCC();
-
-  static void Initialize(bool useThread);
-  static void Terminate();
-
- protected:
-  // Compositor implementation.
-  virtual Texture* CreateTexture() OVERRIDE;
-  virtual void Blur(const gfx::Rect& bounds) OVERRIDE;
-  virtual void ScheduleDraw() OVERRIDE;
-  virtual void OnNotifyStart(bool clear) OVERRIDE;
-  virtual void OnNotifyEnd() OVERRIDE;
-  virtual void OnWidgetSizeChanged() OVERRIDE;
-  virtual void OnRootLayerChanged() OVERRIDE;
-  virtual void DrawTree() OVERRIDE;
-  virtual bool CompositesAsynchronously() OVERRIDE;
-  virtual bool ReadPixels(SkBitmap* bitmap, const gfx::Rect& bounds) OVERRIDE;
-
-  // WebLayerTreeViewClient implementation.
-  // TODO(jamesr): Remove this override once upstream declaration is removed and
-  // rolled into DEPS
-  virtual void animateAndLayout(double frameBeginTime);
-
-  virtual void updateAnimations(double frameBeginTime);
-  virtual void layout();
-  virtual void applyScrollAndScale(const WebKit::WebSize& scrollDelta,
-                                   float scaleFactor);
-  virtual void applyScrollDelta(const WebKit::WebSize&);
-  virtual WebKit::WebGraphicsContext3D* createContext3D();
-  virtual void didCompleteSwapBuffers();
-  virtual void didRebindGraphicsContext(bool success);
-  virtual void scheduleComposite();
-
- private:
-  gfx::AcceleratedWidget widget_;
-  WebKit::WebLayer root_web_layer_;
-  WebKit::WebLayerTreeView host_;
-
-  DISALLOW_COPY_AND_ASSIGN(CompositorCC);
-};
-
-}  // namespace ui
-
-#endif  // UI_GFX_COMPOSITOR_COMPOSITOR_CC_H_