cc: Move WebCompositorOutputSurface and related classes into cc/

content/renderer/gpu/compositor_software_output_device_gl_adapter.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 "content/renderer/gpu/compositor_software_output_device_gl_adapter.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
@@ skipping 21 matching lines @@
       framebuffer_texture_id_(0),
       context3d_(context3D),
       locked_for_write_(false) {
 }
 
 CompositorSoftwareOutputDeviceGLAdapter::
     ~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();
 
   if (framebuffer_texture_size_ != gfx::Size(size))
     Resize(size);
 }
 
 void CompositorSoftwareOutputDeviceGLAdapter::Initialize() {
   // Vertex shader that flips the y axis.
   static const char g_vertex_shader[] =
@@ skipping 109 matching lines @@
   context3d_->texImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
       framebuffer_texture_size_.width(), framebuffer_texture_size_.height(),
       0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
 
   context3d_->drawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
   context3d_->prepareTexture();
 }
 
 }  // namespace content