Android: Add support for CompositorFrame swaps

content/browser/renderer_host/render_widget_host_view_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 
 #include <map>
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "gpu/command_buffer/common/mailbox.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/vector2d_f.h"
 
 struct ViewHostMsg_TextInputState_Params;
 
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 
@@ skipping 104 matching lines @@
   virtual void SetScrollOffsetPinning(
       bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
   virtual void UnhandledWheelEvent(
       const WebKit::WebMouseWheelEvent& event) OVERRIDE;
   virtual void OnAccessibilityNotifications(
       const std::vector<AccessibilityHostMsg_NotificationParams>&
           params) OVERRIDE;
   virtual bool LockMouse() OVERRIDE;
   virtual void UnlockMouse() OVERRIDE;
   virtual void HasTouchEventHandlers(bool need_touch_events) OVERRIDE;
+  virtual void OnSwapCompositorFrame(const cc::CompositorFrame& frame) OVERRIDE;
   virtual void UpdateFrameInfo(const gfx::Vector2dF& scroll_offset,
                                float page_scale_factor,
                                const gfx::Vector2dF& page_scale_factor_limits,
                                const gfx::SizeF& content_size,
                                const gfx::SizeF& viewport_size,
                                const gfx::Vector2dF& controls_offset,
                                const gfx::Vector2dF& content_offset) OVERRIDE;
   virtual void ShowDisambiguationPopup(const gfx::Rect& target_rect,
                                        const SkBitmap& zoomed_bitmap) OVERRIDE;
 
@@ skipping 16 matching lines @@
   bool PopulateBitmapWithContents(jobject jbitmap);
 
   bool HasValidFrame() const;
 
   // Select all text between the given coordinates.
   void SelectRange(const gfx::Point& start, const gfx::Point& end);
 
   void MoveCaret(const gfx::Point& point);
 
  private:
+  void BuffersSwapped(const gpu::Mailbox& mailbox,
+                      const gfx::Size& size,

[Sami, 2013/03/05 17:44:42]

Nit: pass size by value.

[no sievers, 2013/03/05 21:58:05]

Done.

+                      const base::Closure& ack_callback);
+
   // The model object.
   RenderWidgetHostImpl* host_;
 
   // Whether or not this widget is potentially attached to the view hierarchy.
   // This view may not actually be attached if this is true, but it should be
   // treated as such, because as soon as a ContentViewCore is set the layer
   // will be attached automatically.
   bool is_layer_attached_;
 
   // ContentViewCoreImpl is our interface to the view system.
@@ skipping 14 matching lines @@
 
   // The most recent texture id that was pushed to the texture layer.
   unsigned int texture_id_in_layer_;
 
   // The most recent texture size that was pushed to the texture layer.
   gfx::Size texture_size_in_layer_;
 
   // Used for image transport when needing to share resources across threads.
   scoped_ptr<SurfaceTextureTransportClient> surface_texture_transport_;
 
-  // The mailbox name of the previously received frame.
-  std::string current_mailbox_name_;
+  // The mailbox of the previously received frame.
+  gpu::Mailbox current_mailbox_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_