| 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 e69c824d50c9b7f72ff701b0a60f3b859d4755fe..f36887183db5b59bc82eef0d177b340ae582c7ef 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.h
|
| @@ -57,7 +57,7 @@ class ContentViewCoreImpl;
|
| class OverscrollControllerAndroid;
|
| class RenderWidgetHost;
|
| class RenderWidgetHostImpl;
|
| -class SynchronousCompositorImpl;
|
| +class SynchronousCompositorBase;
|
| struct DidOverscrollParams;
|
| struct NativeWebKeyboardEvent;
|
|
|
| @@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| void OnShowingPastePopup(const gfx::PointF& point);
|
| void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
|
|
|
| - SynchronousCompositorImpl* GetSynchronousCompositorImpl();
|
| + SynchronousCompositorBase* GetSynchronousCompositor();
|
| void SynchronousFrameMetadata(
|
| const cc::CompositorFrameMetadata& frame_metadata);
|
|
|
| @@ -327,6 +327,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| bool Animate(base::TimeTicks frame_time);
|
| void RequestDisallowInterceptTouchEvent();
|
|
|
| + bool SyncCompositorOnMessageReceived(const IPC::Message& message);
|
| +
|
| // The model object.
|
| RenderWidgetHostImpl* host_;
|
|
|
| @@ -395,7 +397,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| gfx::Size default_size_;
|
|
|
| const bool using_browser_compositor_;
|
| - scoped_ptr<SynchronousCompositorImpl> sync_compositor_;
|
| + scoped_ptr<SynchronousCompositorBase> sync_compositor_;
|
|
|
| scoped_ptr<DelegatedFrameEvictor> frame_evictor_;
|
|
|
|
|