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 f5939df0fc78a6a31313ab362907e88d232dcdc8..0158afd2af16e2aa494ea957c47e5918340b19ff 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -20,6 +20,7 @@ |
#include "content/browser/aura/image_transport_factory.h" |
#include "content/browser/renderer_host/frame_memory_manager.h" |
#include "content/browser/renderer_host/render_widget_host_view_base.h" |
+#include "content/browser/renderer_host/software_framebuffer.h" |
#include "content/common/content_export.h" |
#include "content/common/gpu/client/gl_helper.h" |
#include "third_party/skia/include/core/SkRegion.h" |
@@ -65,6 +66,7 @@ class ResizeLock; |
// RenderWidgetHostView class hierarchy described in render_widget_host_view.h. |
class CONTENT_EXPORT RenderWidgetHostViewAura |
: public RenderWidgetHostViewBase, |
+ public SoftwareFramebufferClient, |
public ui::CompositorObserver, |
public ui::TextInputClient, |
public gfx::DisplayObserver, |
@@ -76,7 +78,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
public aura::client::CursorClientObserver, |
public ImageTransportFactoryObserver, |
public BrowserAccessibilityDelegate, |
- public FrameContainer, |
public base::SupportsWeakPtr<RenderWidgetHostViewAura> { |
public: |
// Used to notify whenever the paint-content of the view changes. |
@@ -329,8 +330,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
virtual void OnRootWindowHostMoved(const aura::RootWindow* root, |
const gfx::Point& new_origin) OVERRIDE; |
- // FrameContainer implementation: |
- virtual void ReleaseCurrentFrame() OVERRIDE; |
+ // SoftwareFramebufferClient implementation: |
+ virtual void CurrentSoftwareFrameWasDiscarded() OVERRIDE; |
bool CanCopyToBitmap() const; |
@@ -521,10 +522,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
scoped_ptr<cc::SoftwareFrameData> frame_data, |
float frame_device_scale_factor, |
const ui::LatencyInfo& latency_info); |
- void SendSoftwareFrameAck(uint32 output_surface_id); |
- void SendReclaimSoftwareFrames(); |
- void ReleaseSoftwareFrame(uint32 output_surface_id, |
- unsigned software_frame_id); |
void DidReceiveFrameFromRenderer(); |
@@ -602,7 +599,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
scoped_refptr<ui::Texture> current_surface_; |
// This holds the current software framebuffer. |
- scoped_refptr<MemoryHolder> framebuffer_holder_; |
+ scoped_ptr<SoftwareFramebuffer> software_framebuffer_; |
// With delegated renderer, this is the last output surface, used to |
// disambiguate resources with the same id coming from different output |
@@ -722,14 +719,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
ui::LatencyInfo software_latency_info_; |
- struct ReleasedFrameInfo { |
- ReleasedFrameInfo(uint32 output_id, unsigned software_frame_id) |
- : output_surface_id(output_id), frame_id(software_frame_id) {} |
- uint32 output_surface_id; |
- unsigned frame_id; |
- }; |
- std::vector<ReleasedFrameInfo> released_software_frames_; |
- |
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
}; |