Index: webkit/compositor_bindings/web_compositor_support_impl.cc |
diff --git a/webkit/compositor_bindings/web_compositor_support_impl.cc b/webkit/compositor_bindings/web_compositor_support_impl.cc |
index 382505c399fde357c98e2371c80ee2cc995aa362..59d621467cfc074fdf8d13eabb45a8ed05e5940d 100644 |
--- a/webkit/compositor_bindings/web_compositor_support_impl.cc |
+++ b/webkit/compositor_bindings/web_compositor_support_impl.cc |
@@ -7,10 +7,10 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/message_loop_proxy.h" |
#include "cc/output_surface.h" |
+#include "cc/software_output_device.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_software_output_device.h" |
#include "webkit/compositor_bindings/web_content_layer_impl.h" |
#include "webkit/compositor_bindings/web_external_texture_layer_impl.h" |
#include "webkit/compositor_bindings/web_float_animation_curve_impl.h" |
@@ -87,10 +87,9 @@ WebCompositorSupportImpl::createOutputSurfaceFor3D( |
WebKit::WebCompositorOutputSurface* |
WebCompositorSupportImpl::createOutputSurfaceForSoftware() { |
- scoped_ptr<WebCompositorSupportSoftwareOutputDevice> software_device = |
- make_scoped_ptr(new WebCompositorSupportSoftwareOutputDevice); |
- return new cc::OutputSurface( |
- software_device.PassAs<cc::SoftwareOutputDevice>()); |
+ scoped_ptr<cc::SoftwareOutputDevice> software_device = |
+ make_scoped_ptr(new cc::SoftwareOutputDevice); |
+ return new cc::OutputSurface(software_device.Pass()); |
} |
WebLayer* WebCompositorSupportImpl::createLayer() { |