| 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 c7987dcd6fe78c5f380f0f3b85834af6d51452d2..2d3c1900410559e6d7936dbb0589a7b15e66b3f2 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"
|
| @@ -473,7 +474,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 id);
|
|
|
| BrowserAccessibilityManager* GetOrCreateBrowserAccessibilityManager();
|
|
|
| @@ -551,12 +552,11 @@ class RenderWidgetHostViewAura
|
| // The current frontbuffer texture.
|
| scoped_refptr<ui::Texture> current_surface_;
|
|
|
| - // The current frontbuffer DIB.
|
| - scoped_ptr<TransportDIB> current_dib_;
|
| + // The current frontbuffer shared memory.
|
| + cc::TextureMailbox current_frame_;
|
|
|
| - // 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_;
|
| + // Device scale factor in which current_frame_ was rendered.
|
| + float current_frame_scale_factor_;
|
|
|
| // The damage in the previously presented buffer.
|
| SkRegion previous_damage_;
|
|
|