Remove COMPOSITOR_2 flag, old compositor code.

ui/gfx/compositor/compositor_gl.cc

 // Copyright (c) 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 "ui/gfx/compositor/compositor.h"
 
 #include <GL/gl.h>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/gl_surface_glx.h"
 
 namespace ui {
 
-#if defined COMPOSITOR_2
 namespace glHidden {
 
 class CompositorGL;
 
 class TextureGL : public Texture {
  public:
   TextureGL(CompositorGL* compositor);
   virtual ~TextureGL();
 
   virtual void SetBitmap(const SkBitmap& bitmap,
@@ skipping 318 matching lines @@
 
 } // namespace
 
 // static
 Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {
   gfx::GLSurface::InitializeOneOff();
   if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)
     return new glHidden::CompositorGL(widget);
   return NULL;
 }
-#else
-class CompositorGL : public Compositor {
- public:
-  explicit CompositorGL(gfx::AcceleratedWidget widget);
-
- private:
-  // Overridden from Compositor.
-  void NotifyStart() OVERRIDE;
-  void NotifyEnd() OVERRIDE;
-  void DrawTextureWithTransform(TextureID txt,
-                                const ui::Transform& transform) OVERRIDE;
-  void SaveTransform() OVERRIDE;
-  void RestoreTransform() OVERRIDE;
-
-  // The GL context used for compositing.
-  scoped_refptr<gfx::GLSurface> gl_surface_;
-  scoped_refptr<gfx::GLContext> gl_context_;
-
-  // Keep track of whether compositing has started or not.
-  bool started_;
-
-  DISALLOW_COPY_AND_ASSIGN(CompositorGL);
-};
-
-CompositorGL::CompositorGL(gfx::AcceleratedWidget widget)
-    : started_(false) {
-  gl_surface_ = gfx::GLSurface::CreateViewGLSurface(widget);
-  gl_context_ = gfx::GLContext::CreateGLContext(NULL, gl_surface_.get());
-}
-
-void CompositorGL::NotifyStart() {
-  started_ = true;
-  gl_context_->MakeCurrent(gl_surface_.get());
-}
-
-void CompositorGL::NotifyEnd() {
-  DCHECK(started_);
-  gl_surface_->SwapBuffers();
-  started_ = false;
-}
-
-void CompositorGL::DrawTextureWithTransform(TextureID txt,
-                                            const ui::Transform& transform) {
-  DCHECK(started_);
-
-  // TODO(wjmaclean):
-  NOTIMPLEMENTED();
-}
-
-void CompositorGL::SaveTransform() {
-  // TODO(sadrul):
-  NOTIMPLEMENTED();
-}
-
-void CompositorGL::RestoreTransform() {
-  // TODO(sadrul):
-  NOTIMPLEMENTED();
-}
-
-// static
-Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {
-  if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)
-    return new CompositorGL(widget);
-  return NULL;
-}
-#endif
 
 }  // namespace ui