Index: content/renderer/android/synchronous_compositor_proxy.h |
diff --git a/content/renderer/android/synchronous_compositor_proxy.h b/content/renderer/android/synchronous_compositor_proxy.h |
index 07488efb138503b9c6cf5c839929a07b8a75e8f8..39617b254053275feeaa17a7c7c26b51fac34c7b 100644 |
--- a/content/renderer/android/synchronous_compositor_proxy.h |
+++ b/content/renderer/android/synchronous_compositor_proxy.h |
@@ -34,6 +34,7 @@ struct SyncCompositorCommonBrowserParams; |
struct SyncCompositorCommonRendererParams; |
struct SyncCompositorDemandDrawHwParams; |
struct SyncCompositorDemandDrawSwParams; |
+struct SyncCompositorSetSharedMemoryParams; |
class SynchronousCompositorProxy |
: public ui::SynchronousInputHandler, |
@@ -69,6 +70,8 @@ class SynchronousCompositorProxy |
void DidOverscroll(const DidOverscrollParams& did_overscroll_params); |
private: |
+ struct SharedMemoryWithSize; |
+ |
void ProcessCommonParams( |
const SyncCompositorCommonBrowserParams& common_params); |
void PopulateCommonParams(SyncCompositorCommonRendererParams* params); |
@@ -90,6 +93,12 @@ class SynchronousCompositorProxy |
const SyncCompositorDemandDrawHwParams& params, |
SyncCompositorCommonRendererParams* common_renderer_params, |
cc::CompositorFrame* frame); |
+ void SetSharedMemory( |
+ const SyncCompositorCommonBrowserParams& common_params, |
+ const SyncCompositorSetSharedMemoryParams& params, |
+ bool* success, |
+ SyncCompositorCommonRendererParams* common_renderer_params); |
+ void ZeroSharedMemory(); |
void DemandDrawSw(const SyncCompositorCommonBrowserParams& common_params, |
const SyncCompositorDemandDrawSwParams& params, |
bool* result, |
@@ -110,7 +119,9 @@ class SynchronousCompositorProxy |
// From browser. |
size_t bytes_limit_; |
+ scoped_ptr<SharedMemoryWithSize> software_draw_shm_; |
+ // To browser. |
uint32_t version_; |
gfx::ScrollOffset total_scroll_offset_; // Modified by both. |
gfx::ScrollOffset max_scroll_offset_; |