Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 26023004: aura: Allow delegated frames to be used by more than one impl layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: frameprovider: are_layers_attached checks Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index d85c43bc285f35799806ba25e488040821d9be3d..5429e4a219ecc517fae2893f041c1f2dc4494fd8 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -14,6 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/process/process.h"
+#include "cc/layers/delegated_frame_resource_collection.h"
#include "cc/layers/delegated_renderer_layer_client.h"
#include "cc/layers/texture_layer_client.h"
#include "cc/output/begin_frame_args.h"
@@ -34,6 +35,7 @@ struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
namespace cc {
class CopyOutputResult;
+class DelegatedFrameProvider;
class DelegatedRendererLayer;
class Layer;
class SingleReleaseCallback;
@@ -61,6 +63,7 @@ class RenderWidgetHostViewAndroid
public BrowserAccessibilityDelegate,
public cc::TextureLayerClient,
public cc::DelegatedRendererLayerClient,
+ public cc::DelegatedFrameResourceCollectionClient,
public ImageTransportFactoryAndroidObserver {
public:
RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
@@ -195,7 +198,9 @@ class RenderWidgetHostViewAndroid
// cc::DelegatedRendererLayerClient implementation.
virtual void DidCommitFrameData() OVERRIDE;
- virtual void UnusedResourcesAreAvailable() OVERRIDE {}
+
+ // cc::DelegatedFrameResourceCollectionClient implementation.
+ virtual void UnusedResourcesAreAvailable() OVERRIDE;
// ImageTransportFactoryAndroidObserver implementation.
virtual void OnLostResources() OVERRIDE;
@@ -246,6 +251,7 @@ class RenderWidgetHostViewAndroid
void RunAckCallbacks();
+ void DestroyDelegatedContent();
void SwapDelegatedFrame(uint32 output_surface_id,
scoped_ptr<cc::DelegatedFrameData> frame_data);
void SendDelegatedFrameAck(uint32 output_surface_id);
@@ -297,6 +303,8 @@ class RenderWidgetHostViewAndroid
// The texture layer for this view when using browser-side compositing.
scoped_refptr<cc::TextureLayer> texture_layer_;
+ scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_;
+ scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
scoped_refptr<cc::DelegatedRendererLayer> delegated_renderer_layer_;
// The layer used for rendering the contents of this view.
« no previous file with comments | « cc/trees/layer_tree_host_unittest_delegated.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698