diff options
Diffstat (limited to 'webkit')
5 files changed, 6 insertions, 113 deletions
diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp index b1d87b2..b115b67 100644 --- a/webkit/compositor_bindings/compositor_bindings.gyp +++ b/webkit/compositor_bindings/compositor_bindings.gyp @@ -11,8 +11,6 @@ 'web_animation_id_provider.h', 'web_animation_impl.cc', 'web_animation_impl.h', - 'web_compositor_support_output_surface.cc', - 'web_compositor_support_output_surface.h', 'web_compositor_support_software_output_device.cc', 'web_compositor_support_software_output_device.h', 'web_content_layer_impl.cc', diff --git a/webkit/compositor_bindings/web_compositor_support_impl.cc b/webkit/compositor_bindings/web_compositor_support_impl.cc index 705f74f..1f19bed2 100644 --- a/webkit/compositor_bindings/web_compositor_support_impl.cc +++ b/webkit/compositor_bindings/web_compositor_support_impl.cc @@ -6,10 +6,10 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" +#include "cc/output_surface.h" #include "cc/thread_impl.h" #include "cc/transform_operations.h" #include "webkit/compositor_bindings/web_animation_impl.h" -#include "webkit/compositor_bindings/web_compositor_support_output_surface.h" #include "webkit/compositor_bindings/web_compositor_support_software_output_device.h" #include "webkit/compositor_bindings/web_content_layer_impl.h" #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" @@ -84,16 +84,15 @@ WebKit::WebCompositorOutputSurface* WebCompositorSupportImpl::createOutputSurfaceFor3D( WebKit::WebGraphicsContext3D* context) { scoped_ptr<WebKit::WebGraphicsContext3D> context3d = make_scoped_ptr(context); - return WebCompositorSupportOutputSurface::Create3d( - context3d.Pass()).release(); + return new cc::OutputSurface(context3d.Pass()); } WebKit::WebCompositorOutputSurface* WebCompositorSupportImpl::createOutputSurfaceForSoftware() { scoped_ptr<WebCompositorSupportSoftwareOutputDevice> software_device = make_scoped_ptr(new WebCompositorSupportSoftwareOutputDevice); - return WebCompositorSupportOutputSurface::CreateSoftware( - software_device.PassAs<cc::SoftwareOutputDevice>()).release(); + return new cc::OutputSurface( + software_device.PassAs<cc::SoftwareOutputDevice>()); } WebLayer* WebCompositorSupportImpl::createLayer() { diff --git a/webkit/compositor_bindings/web_compositor_support_output_surface.cc b/webkit/compositor_bindings/web_compositor_support_output_surface.cc deleted file mode 100644 index 03d49f1..0000000 --- a/webkit/compositor_bindings/web_compositor_support_output_surface.cc +++ /dev/null @@ -1,49 +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 "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" -#include "webkit/compositor_bindings/web_compositor_support_output_surface.h" - -namespace webkit { - -WebCompositorSupportOutputSurface::WebCompositorSupportOutputSurface( - scoped_ptr<WebKit::WebGraphicsContext3D> context3d) { - context3d_ = context3d.Pass(); -} - -WebCompositorSupportOutputSurface::WebCompositorSupportOutputSurface( - scoped_ptr<cc::SoftwareOutputDevice> software_device) { - software_device_ = software_device.Pass(); -} - -WebCompositorSupportOutputSurface::~WebCompositorSupportOutputSurface() {} - -bool WebCompositorSupportOutputSurface::BindToClient( - cc::OutputSurfaceClient* client) { - if (!context3d_) - return true; - DCHECK(client); - return context3d_->makeContextCurrent(); -} - -const struct cc::OutputSurface::Capabilities& - WebCompositorSupportOutputSurface::Capabilities() const { - return capabilities_; -} - -WebKit::WebGraphicsContext3D* WebCompositorSupportOutputSurface::Context3D() const { - return context3d_.get(); -} - -cc::SoftwareOutputDevice* WebCompositorSupportOutputSurface::SoftwareDevice() const { - return software_device_.get(); -} - -void WebCompositorSupportOutputSurface::SendFrameToParentCompositor( - cc::CompositorFrame*) { - // No support for delegated renderers in DumpRenderTree. - NOTREACHED(); -} - -} // namespace webkit diff --git a/webkit/compositor_bindings/web_compositor_support_output_surface.h b/webkit/compositor_bindings/web_compositor_support_output_surface.h deleted file mode 100644 index c1bd598..0000000 --- a/webkit/compositor_bindings/web_compositor_support_output_surface.h +++ /dev/null @@ -1,54 +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 WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE -#define WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE - -#include "base/memory/scoped_ptr.h" -#include "cc/output_surface.h" -#include "webkit/compositor_bindings/web_compositor_support_software_output_device.h" -#include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" - -namespace webkit { - -class WebCompositorSupportOutputSurface : public cc::OutputSurface { - public: - - static inline scoped_ptr<WebCompositorSupportOutputSurface> Create3d( - scoped_ptr<WebKit::WebGraphicsContext3D> context3d) { - return make_scoped_ptr( - new WebCompositorSupportOutputSurface(context3d.Pass())); - } - - static inline scoped_ptr<WebCompositorSupportOutputSurface> CreateSoftware( - scoped_ptr<cc::SoftwareOutputDevice> software_device) { - return make_scoped_ptr( - new WebCompositorSupportOutputSurface(software_device.Pass())); - } - - virtual ~WebCompositorSupportOutputSurface(); - - virtual bool BindToClient(cc::OutputSurfaceClient*) OVERRIDE; - - virtual const struct Capabilities& Capabilities() const OVERRIDE; - - virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE; - virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE; - - virtual void SendFrameToParentCompositor(cc::CompositorFrame*) OVERRIDE; - -private: - WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebCompositorSupportOutputSurface( - scoped_ptr<WebKit::WebGraphicsContext3D> context3d); - WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebCompositorSupportOutputSurface( - scoped_ptr<cc::SoftwareOutputDevice> software_device); - - struct cc::OutputSurface::Capabilities capabilities_; - scoped_ptr<WebKit::WebGraphicsContext3D> context3d_; - scoped_ptr<cc::SoftwareOutputDevice> software_device_; -}; - -} // namespace webkit - -#endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_COMPOSITOR_SUPPORT_OUTPUT_SURFACE diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc index 0162afd..69caab9 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc @@ -10,6 +10,7 @@ #include "cc/input_handler.h" #include "cc/layer.h" #include "cc/layer_tree_host.h" +#include "cc/output_surface.h" #include "cc/switches.h" #include "cc/thread.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" @@ -19,7 +20,6 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "webkit/compositor_bindings/web_compositor_support_output_surface.h" #include "webkit/compositor_bindings/web_layer_impl.h" #include "webkit/compositor_bindings/web_rendering_stats_impl.h" #include "webkit/compositor_bindings/web_to_ccinput_handler_adapter.h" @@ -158,8 +158,7 @@ scoped_ptr<cc::OutputSurface> WebLayerTreeViewImplForTesting::createOutputSurface() { scoped_ptr<WebGraphicsContext3D> context3d( new cc::FakeWebGraphicsContext3D); - return webkit::WebCompositorSupportOutputSurface::Create3d( - context3d.Pass()).PassAs<cc::OutputSurface>(); + return make_scoped_ptr(new cc::OutputSurface(context3d.Pass())); } void WebLayerTreeViewImplForTesting::didRecreateOutputSurface(bool success) { } |