[Aura] Added Support for rendering software compositor frames as cc::TextureLayers.

content/browser/renderer_host/render_widget_host_view_aura.h

Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 95fcdbb70e52bbe0f7f816e410f998ec5d90eaed..bbda3c0b85463bd2938c40940698c4ff7fc59b41 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -15,6 +15,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "cc/resources/texture_mailbox.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/renderer_host/image_transport_factory.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -481,7 +482,7 @@ class RenderWidgetHostViewAura
   void SwapSoftwareFrame(
       scoped_ptr<cc::SoftwareFrameData> frame_data,
       float frame_device_scale_factor);
-  void SendSoftwareFrameAck(const TransportDIB::Id& id);
+  void SendSoftwareFrameAck(int software_frame_id);

[piman, 2013/06/05 00:30:55]

unsigned int.

[slavi, 2013/06/06 23:02:47]

Done.

 
   BrowserAccessibilityManager* GetOrCreateBrowserAccessibilityManager();
 
@@ -559,12 +560,8 @@ class RenderWidgetHostViewAura
   // The current frontbuffer texture.
   scoped_refptr<ui::Texture> current_surface_;
 
-  // The current frontbuffer DIB.
-  scoped_ptr<TransportDIB> current_dib_;
-
-  // The current DIB id as it was received from the renderer. Note that on
-  // some platforms (e.g. Windows) this is different from current_dib_->id().
-  TransportDIB::Id current_dib_id_;
+  // The current software frontbuffer.
+  cc::TextureMailbox current_software_frame_;
 
   // The damage in the previously presented buffer.
   SkRegion previous_damage_;