Remove old (pre-webkit) compositor

BUG=103948
TEST=builds, tests pass

Review URL: http://codereview.chromium.org/9288053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119402 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 112 deletions

diff --git a/content/browser/renderer_host/accelerated_surface_container_linux_gl.cc b/content/browser/renderer_host/accelerated_surface_container_linux_gl.cc
deleted file mode 100644
index 78d1169..0000000
--- a/content/browser/renderer_host/accelerated_surface_container_linux_gl.cc
+++ /dev/null
@@ -1,86 +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.
-
-#include "content/browser/renderer_host/accelerated_surface_container_linux.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "content/browser/renderer_host/image_transport_client.h"
-#include "ui/gfx/compositor/compositor_gl.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/transform.h"
-
-namespace {
-
-class AcceleratedSurfaceContainerLinuxGL
-    : public AcceleratedSurfaceContainerLinux, public ui::TextureGL {
- public:
-  explicit AcceleratedSurfaceContainerLinuxGL(const gfx::Size& size)
-      : ui::TextureGL(size) {
-  }
-
-  virtual ~AcceleratedSurfaceContainerLinuxGL() { }
-  virtual void AddRef() { ui::TextureGL::AddRef(); }
-  virtual void Release() { ui::TextureGL::Release(); }
-
-  virtual bool Initialize(uint64* surface_handle) OVERRIDE {
-    ui::SharedResourcesGL* instance = ui::SharedResourcesGL::GetInstance();
-    DCHECK(instance);
-    image_transport_client_.reset(
-        ImageTransportClient::Create(instance, size_));
-    if (!image_transport_client_.get())
-      return false;
-
-    texture_id_ = image_transport_client_->Initialize(surface_handle);
-    if (!texture_id_) {
-      image_transport_client_.reset();
-      return false;
-    }
-    return true;
-  }
-
-  virtual const gfx::Size& GetSize() {
-    return ui::TextureGL::size();
-  }
-
-  // TextureGL implementation
-  virtual void SetCanvas(const SkCanvas& canvas,
-                         const gfx::Point& origin,
-                         const gfx::Size& overall_size) OVERRIDE {
-    NOTREACHED();
-  }
-
-  virtual void Draw(const ui::TextureDrawParams& params,
-                    const gfx::Rect& clip_bounds_in_texture) OVERRIDE {
-    image_transport_client_->Acquire();
-
-    ui::TextureDrawParams modified_params = params;
-    if (image_transport_client_->Flipped())
-      modified_params.vertically_flipped = true;
-
-    ui::SharedResourcesGL* instance = ui::SharedResourcesGL::GetInstance();
-    DrawInternal(*instance->program_no_swizzle(),
-        modified_params,
-        clip_bounds_in_texture);
-
-    image_transport_client_->Release();
-  }
-
-  virtual TransportDIB::Handle Handle() const {
-    return image_transport_client_->Handle();
-  }
-
-  virtual ui::Texture* GetTexture() { return this; }
-
- private:
-  scoped_ptr<ImageTransportClient> image_transport_client_;
-  DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerLinuxGL);
-};
-
-}  // namespace
-
-// static
-AcceleratedSurfaceContainerLinux*
-AcceleratedSurfaceContainerLinux::Create(const gfx::Size& size) {
-  return new AcceleratedSurfaceContainerLinuxGL(size);
-}
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index a527fc0..1c23638 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -400,7 +400,6 @@
     'browser/renderer_host/accelerated_plugin_view_mac.h',
     'browser/renderer_host/accelerated_plugin_view_mac.mm',
     'browser/renderer_host/accelerated_surface_container_linux_cc.cc',
-    'browser/renderer_host/accelerated_surface_container_linux_gl.cc',
     'browser/renderer_host/accelerated_surface_container_linux.h',
     'browser/renderer_host/accelerated_surface_container_mac.cc',
     'browser/renderer_host/accelerated_surface_container_mac.h',
@@ -822,20 +821,8 @@
       'include_dirs': [
         '../third_party/angle/include',
       ],
-      'conditions': [
-        ['use_webkit_compositor != 1', {
-          'sources/': [
-            ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_cc.cc'],
-          ],
-        }, {
-          'sources/': [
-            ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_gl.cc'],
-          ],
-        }],
-      ],
     }, {
       'sources/': [
-        ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_gl.cc'],
         ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_cc.cc'],
         ['exclude', '^browser/renderer_host/accelerated_surface_container_linux.h'],
         ['exclude', '^browser/renderer_host/image_transport_client.cc'],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 8f97927..9f3d2e7 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -141,14 +141,10 @@
             '../build/linux/system.gyp:glib',
           ],
         }],
-        ['use_webkit_compositor==1 and views_compositor==1', {
+        ['views_compositor==1', {
           'dependencies': [
             '../ui/gfx/compositor/compositor.gyp:compositor',
           ],
-        }, {
-          'dependencies': [
-            '../ui/gfx/compositor/compositor.gyp:test_compositor',
-          ],
         }],
       ],
     },
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index e1cecd9..be090fe 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -17,11 +17,7 @@
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
-#if defined(USE_WEBKIT_COMPOSITOR)
 #include "ui/gfx/compositor/compositor_setup.h"
-#else
-#include "ui/gfx/test/gfx_test_utils.h"
-#endif
 
 namespace {
 
@@ -79,11 +75,7 @@ void ContentTestSuite::Initialize() {
   ui::RegisterPathProvider();
 
   // Mock out the compositor on platforms that use it.
-#if defined(USE_WEBKIT_COMPOSITOR)
   ui::SetupTestCompositor();
-#else
-  ui::gfx_test_utils::SetupTestCompositor();
-#endif
 
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();