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

content/browser/renderer_host/render_widget_host_view_aura.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_AURA_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #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"
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/cursor_client_observer.h"
 #include "ui/aura/client/focus_change_observer.h"
@@ skipping 446 matching lines @@
       const scoped_refptr<ui::Texture>& texture_to_return);
 
   void SwapDelegatedFrame(
       scoped_ptr<cc::DelegatedFrameData> frame_data,
       float frame_device_scale_factor);
   void SendDelegatedFrameAck();
 
   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();
 
 #if defined(OS_WIN)
   // Sets the cutout rects from transient windows. These are rectangles that
   // windowed NPAPI plugins shouldn't paint in. Overwrites any previous cutout
   // rects.
   void UpdateTransientRects(const std::vector<gfx::Rect>& rects);
 
   // Updates the total list of cutout rects, which is the union of transient
@@ skipping 57 matching lines @@
   bool has_composition_text_;
 
   // Current tooltip text.
   string16 tooltip_;
 
   std::vector<base::Closure> on_compositing_did_commit_callbacks_;
 
   // 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_;
 
   // Pending damage from previous frames that we skipped.
   SkRegion skipped_damage_;
 
   // The size of the last frame that was swapped (even if we skipped it).
   // Used to determine when the skipped_damage_ needs to be reset due to
   // size changes between front- and backbuffer.
@@ skipping 99 matching lines @@
       yuv_readback_pipeline_;
 
   TouchEditingClient* touch_editing_client_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_