cc: Move WebCompositorOutputSurface and related classes into cc/

content/renderer/gpu/compositor_software_output_device_gl_adapter.cc

Index: content/renderer/gpu/compositor_software_output_device_gl_adapter.cc
diff --git a/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc b/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc
index e9c8df419aa931c9e2fcde468cce58cf968322ce..1e9372a20571a687c285594e6657ced3c5386193 100644
--- a/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc
+++ b/content/renderer/gpu/compositor_software_output_device_gl_adapter.cc
@@ -39,20 +39,20 @@ CompositorSoftwareOutputDeviceGLAdapter::
   Destroy();
 }
 
-WebImage* CompositorSoftwareOutputDeviceGLAdapter::lock(bool forWrite) {
+WebImage* CompositorSoftwareOutputDeviceGLAdapter::Lock(bool forWrite) {
   locked_for_write_ = forWrite;
   image_ = device_->accessBitmap(forWrite);
   return &image_;
 }
 
-void CompositorSoftwareOutputDeviceGLAdapter::unlock() {
+void CompositorSoftwareOutputDeviceGLAdapter::Unlock() {
   if (locked_for_write_)
     Draw(device_->accessBitmap(false).pixelRef()->pixels());
   image_.reset();
 }
 
-void CompositorSoftwareOutputDeviceGLAdapter::didChangeViewportSize(
-    WebSize size) {
+void CompositorSoftwareOutputDeviceGLAdapter::DidChangeViewportSize(
+    gfx::Size size) {
   if (!initialized_)
     Initialize();