Remove WebIOSurfaceLayer

Thanks to Antoine's work in crrev.com/173545 and WebKit r137653, plugins
manage their compositing layers using the cc:: types instead of WebKit types.
This means WebIOSurfaceLayer isn't used anywhere and can be deleted.

R=piman@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12428009

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

5 files changed, 0 insertions, 69 deletions

diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp
index 4b1fe6f..9f85c8c 100644
--- a/webkit/compositor_bindings/compositor_bindings.gyp
+++ b/webkit/compositor_bindings/compositor_bindings.gyp
@@ -15,8 +15,6 @@
       'web_external_texture_layer_impl.h',
       'web_float_animation_curve_impl.cc',
       'web_float_animation_curve_impl.h',
-      'web_io_surface_layer_impl.cc',
-      'web_io_surface_layer_impl.h',
       'web_image_layer_impl.cc',
       'web_image_layer_impl.h',
       'web_layer_impl.cc',
diff --git a/webkit/compositor_bindings/web_compositor_support_impl.cc b/webkit/compositor_bindings/web_compositor_support_impl.cc
index 19cf7ff..6af6495 100644
--- a/webkit/compositor_bindings/web_compositor_support_impl.cc
+++ b/webkit/compositor_bindings/web_compositor_support_impl.cc
@@ -15,7 +15,6 @@
 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h"
 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
 #include "webkit/compositor_bindings/web_image_layer_impl.h"
-#include "webkit/compositor_bindings/web_io_surface_layer_impl.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/compositor_bindings/web_scrollbar_layer_impl.h"
 #include "webkit/compositor_bindings/web_solid_color_layer_impl.h"
@@ -32,7 +31,6 @@ using WebKit::WebContentLayerClient;
 using WebKit::WebExternalTextureLayer;
 using WebKit::WebExternalTextureLayerClient;
 using WebKit::WebFloatAnimationCurve;
-using WebKit::WebIOSurfaceLayer;
 using WebKit::WebImageLayer;
 using WebKit::WebImageLayer;
 using WebKit::WebLayer;
@@ -104,10 +102,6 @@ WebExternalTextureLayer* WebCompositorSupportImpl::createExternalTextureLayer(
   return new WebKit::WebExternalTextureLayerImpl(client);
 }
 
-WebKit::WebIOSurfaceLayer* WebCompositorSupportImpl::createIOSurfaceLayer() {
-  return new WebKit::WebIOSurfaceLayerImpl();
-}
-
 WebKit::WebImageLayer* WebCompositorSupportImpl::createImageLayer() {
   return new WebKit::WebImageLayerImpl();
 }
diff --git a/webkit/compositor_bindings/web_compositor_support_impl.h b/webkit/compositor_bindings/web_compositor_support_impl.h
index a83b8df..9688bcf 100644
--- a/webkit/compositor_bindings/web_compositor_support_impl.h
+++ b/webkit/compositor_bindings/web_compositor_support_impl.h
@@ -34,7 +34,6 @@ class WebCompositorSupportImpl : public WebKit::WebCompositorSupport {
       WebKit::WebContentLayerClient* client);
   virtual WebKit::WebExternalTextureLayer* createExternalTextureLayer(
       WebKit::WebExternalTextureLayerClient* client);
-  virtual WebKit::WebIOSurfaceLayer* createIOSurfaceLayer();
   virtual WebKit::WebImageLayer* createImageLayer();
   virtual WebKit::WebSolidColorLayer* createSolidColorLayer();
   virtual WebKit::WebVideoLayer* createVideoLayer(
diff --git a/webkit/compositor_bindings/web_io_surface_layer_impl.cc b/webkit/compositor_bindings/web_io_surface_layer_impl.cc
deleted file mode 100644
index e4ddc72..0000000
--- a/webkit/compositor_bindings/web_io_surface_layer_impl.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 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 "webkit/compositor_bindings/web_io_surface_layer_impl.h"
-
-#include "cc/io_surface_layer.h"
-#include "webkit/compositor_bindings/web_layer_impl.h"
-
-using cc::IOSurfaceLayer;
-
-namespace WebKit {
-
-WebIOSurfaceLayerImpl::WebIOSurfaceLayerImpl()
-    : layer_(new WebLayerImpl(IOSurfaceLayer::create())) {
-  layer_->layer()->setIsDrawable(true);
-}
-
-WebIOSurfaceLayerImpl::~WebIOSurfaceLayerImpl() {}
-
-void WebIOSurfaceLayerImpl::setIOSurfaceProperties(unsigned io_surface_id,
-                                                   WebSize size) {
-  static_cast<IOSurfaceLayer*>(layer_->layer())
-      ->setIOSurfaceProperties(io_surface_id, size);
-}
-
-WebLayer* WebIOSurfaceLayerImpl::layer() { return layer_.get(); }
-
-}  // namespace WebKit
diff --git a/webkit/compositor_bindings/web_io_surface_layer_impl.h b/webkit/compositor_bindings/web_io_surface_layer_impl.h
deleted file mode 100644
index fe4dedb..0000000
--- a/webkit/compositor_bindings/web_io_surface_layer_impl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 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 WebIOSurfaceLayerImpl_h
-#define WebIOSurfaceLayerImpl_h
-
-#include "base/memory/scoped_ptr.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebIOSurfaceLayer.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
-#include "webkit/compositor_bindings/webkit_compositor_bindings_export.h"
-
-namespace WebKit {
-
-class WebIOSurfaceLayerImpl : public WebIOSurfaceLayer {
- public:
-  WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebIOSurfaceLayerImpl();
-  virtual ~WebIOSurfaceLayerImpl();
-
-  // WebIOSurfaceLayer implementation.
-  virtual WebLayer* layer();
-  virtual void setIOSurfaceProperties(unsigned io_surface_id, WebSize);
-
- private:
-  scoped_ptr<WebLayerImpl> layer_;
-};
-
-}
-
-#endif  // WebIOSurfaceLayerImpl_h
-