[CLOSED] In-browser software compositing

content/renderer/gpu/compositor_software_output_device_gl_adapter.h

Index: content/renderer/gpu/compositor_software_output_device_gl_adapter.h
diff --git a/content/renderer/gpu/compositor_software_output_device_gl_adapter.h b/content/renderer/gpu/compositor_software_output_device_gl_adapter.h
index 5d77edc29b6abfa28350d50a953c1c89f7602e38..19148bda818cfeca86fd1f13d66705c8fc02770c 100644
--- a/content/renderer/gpu/compositor_software_output_device_gl_adapter.h
+++ b/content/renderer/gpu/compositor_software_output_device_gl_adapter.h
@@ -1,56 +1,42 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_
 #define CONTENT_RENDERER_GPU_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_GL_ADAPTER_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
-#include "cc/software_output_device.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
+#include "cc/software_output_device_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
-#include "ui/gfx/size.h"
+
+class SkCanvas;
+class SkDevice;
 
 namespace content {
 
 // This class can be created only on the main thread, but then becomes pinned
-// to a fixed thread when bindToClient is called.
+// to a fixed thread when CompositorOutputSurface::bindToClient is called.
 class CompositorSoftwareOutputDeviceGLAdapter
-    : NON_EXPORTED_BASE(public cc::SoftwareOutputDevice),
+    : NON_EXPORTED_BASE(public cc::SoftwareOutputDeviceImpl),
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
 public:
   CompositorSoftwareOutputDeviceGLAdapter(
       WebKit::WebGraphicsContext3D* context3d);
   virtual ~CompositorSoftwareOutputDeviceGLAdapter();
 
-  // cc::SoftwareOutputDevice implementation
-  virtual WebKit::WebImage* Lock(bool forWrite) OVERRIDE;
-  virtual void Unlock() OVERRIDE;
-  virtual void DidChangeViewportSize(gfx::Size size) OVERRIDE;
+  virtual void Resize(const gfx::Size& size) OVERRIDE;
+  virtual void EndPaint(const gfx::Rect& damage_rect) OVERRIDE;
 
 private:
-  void Initialize();
-  void Destroy();
-  void Resize(const gfx::Size& viewportSize);
-  void Draw(void* pixels);
-
-  bool initialized_;
-  int program_;
-  int vertex_shader_;
-  int fragment_shader_;
-  unsigned int vertex_buffer_;
-  unsigned framebuffer_texture_id_;
-  gfx::Size framebuffer_texture_size_;
+  void InitShaders();
 
+  unsigned program_;
+  unsigned vertex_shader_;
+  unsigned fragment_shader_;
+  unsigned vertex_buffer_;
+  unsigned texture_id_;
   scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
-  scoped_ptr<SkDevice> device_;
-  WebKit::WebImage image_;
-  bool locked_for_write_;
 };
 
 }  // namespace content