| 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.
|
|
|