Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_android.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
| index 3b3fb8a39fb92560af83beeb9f5d6d325c2c7c3f..e4f2e61017ca24b6202809d701e004eac0c44a20 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -36,9 +36,9 @@ |
| #include "content/browser/accessibility/browser_accessibility_manager_android.h" |
| #include "content/browser/android/composited_touch_handle_drawable.h" |
| #include "content/browser/android/content_view_core_impl.h" |
| -#include "content/browser/android/in_process/synchronous_compositor_impl.h" |
| #include "content/browser/android/overscroll_controller_android.h" |
| #include "content/browser/android/popup_touch_handle_drawable.h" |
| +#include "content/browser/android/synchronous_compositor_base.h" |
| #include "content/browser/devtools/render_frame_devtools_agent_host.h" |
| #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
| #include "content/browser/gpu/compositor_util.h" |
| @@ -356,6 +356,9 @@ void RenderWidgetHostViewAndroid::Blur() { |
| bool RenderWidgetHostViewAndroid::OnMessageReceived( |
| const IPC::Message& message) { |
| + if (SyncCompositorOnMessageReceived(message)) { |
|
no sievers
2015/10/29 01:37:00
can you do a IPC_MESSAGE_ID_CLASS(message.type())
boliu
2015/10/29 04:24:43
Done.
|
| + return true; |
| + } |
| bool handled = true; |
| IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAndroid, message) |
| IPC_MESSAGE_HANDLER(ViewHostMsg_StartContentIntent, OnStartContentIntent) |
| @@ -370,6 +373,11 @@ bool RenderWidgetHostViewAndroid::OnMessageReceived( |
| return handled; |
| } |
| +bool RenderWidgetHostViewAndroid::SyncCompositorOnMessageReceived( |
| + const IPC::Message& message) { |
| + return sync_compositor_ && sync_compositor_->OnMessageReceived(message); |
| +} |
| + |
| void RenderWidgetHostViewAndroid::InitAsChild(gfx::NativeView parent_view) { |
| NOTIMPLEMENTED(); |
| } |
| @@ -1179,8 +1187,8 @@ void RenderWidgetHostViewAndroid::RetainFrame( |
| last_frame_info_.reset(new LastFrameInfo(output_surface_id, frame.Pass())); |
| } |
| -SynchronousCompositorImpl* |
| -RenderWidgetHostViewAndroid::GetSynchronousCompositorImpl() { |
| +SynchronousCompositorBase* |
| +RenderWidgetHostViewAndroid::GetSynchronousCompositor() { |
| return sync_compositor_.get(); |
| } |
| @@ -1812,7 +1820,7 @@ void RenderWidgetHostViewAndroid::SetContentViewCore( |
| } |
| if (!sync_compositor_) { |
| - sync_compositor_ = SynchronousCompositorImpl::Create( |
| + sync_compositor_ = SynchronousCompositorBase::Create( |
| this, content_view_core_->GetWebContents()); |
| } |
| } |