[CLOSED] In-browser software compositing

webkit/compositor_bindings/web_compositor_support_impl.cc

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 067f384090e2b34bcf5fff170ae1c1693dbffbee..f8688a1de38d711e617a2b5e0fb59b3054b9e6a7 100644
--- a/webkit/compositor_bindings/web_compositor_support_impl.cc
+++ b/webkit/compositor_bindings/web_compositor_support_impl.cc
@@ -6,11 +6,11 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
+#include "cc/output_surface_impl.h"
+#include "cc/software_output_device_impl.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"
 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
@@ -100,16 +100,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::OutputSurfaceImpl(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();
+  scoped_ptr<cc::SoftwareOutputDeviceImpl> software_device =
+      make_scoped_ptr(new cc::SoftwareOutputDeviceImpl);
+  return new cc::OutputSurfaceImpl(
+      software_device.PassAs<cc::SoftwareOutputDevice>());
 }
 
 WebLayer* WebCompositorSupportImpl::createLayer() {