Changed SoftwareOutputDevice interface.

webkit/compositor_bindings/web_compositor_support_impl.cc

 // 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 "webkit/compositor_bindings/web_compositor_support_impl.h"
 
 #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"
 #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"
 #include "webkit/compositor_bindings/web_transform_animation_curve_impl.h"
 #include "webkit/compositor_bindings/web_transform_operations_impl.h"
@@ skipping 56 matching lines @@
 
 WebKit::WebCompositorOutputSurface*
 WebCompositorSupportImpl::createOutputSurfaceFor3D(
     WebKit::WebGraphicsContext3D* context) {
   scoped_ptr<WebKit::WebGraphicsContext3D> context3d = make_scoped_ptr(context);
   return new cc::OutputSurface(context3d.Pass());
 }
 
 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() {
   return new WebKit::WebLayerImpl();
 }
 
 WebContentLayer* WebCompositorSupportImpl::createContentLayer(
     WebContentLayerClient* client) {
   return new WebKit::WebContentLayerImpl(client);
 }
@@ skipping 41 matching lines @@
 WebTransformAnimationCurve*
 WebCompositorSupportImpl::createTransformAnimationCurve() {
   return new WebKit::WebTransformAnimationCurveImpl();
 }
 
 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() {
   return new WebTransformOperationsImpl();
 }
 
 }  // namespace webkit