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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 1264963003: Disable tap suppression controller on Android WebView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « content/browser/renderer_host/input/input_router_config_helper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index a2463dd36d1e0719631abb759ea87315c340e9a9..0aa3f2ec6e116e9b68435210b2cba30e0ced70f9 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -33,6 +33,7 @@
#include "content/browser/gpu/gpu_process_host.h"
#include "content/browser/gpu/gpu_process_host_ui_shim.h"
#include "content/browser/gpu/gpu_surface_tracker.h"
+#include "content/browser/renderer_host/compositor_impl_android.h"
jdduke (slow) 2015/07/31 16:35:25 We definitely can't include this without a guard.
#include "content/browser/renderer_host/dip_util.h"
#include "content/browser/renderer_host/frame_metadata_util.h"
#include "content/browser/renderer_host/input/input_router_config_helper.h"
@@ -206,8 +207,10 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
latency_tracker_.Initialize(routing_id_, GetProcess()->GetID());
+ bool using_browser_compositor = CompositorImpl::IsInitialized();
input_router_.reset(new InputRouterImpl(
- process_, this, this, routing_id_, GetInputRouterConfigForPlatform()));
+ process_, this, this, routing_id_,
+ GetInputRouterConfigForPlatform(using_browser_compositor)));
touch_emulator_.reset();
@@ -1223,8 +1226,10 @@ void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status,
// renderer. Otherwise it may be stuck waiting for the old renderer to ack an
// event. (In particular, the above call to view_->RenderProcessGone will
// destroy the aura window, which may dispatch a synthetic mouse move.)
+ bool using_browser_compositor = CompositorImpl::IsInitialized();
input_router_.reset(new InputRouterImpl(
- process_, this, this, routing_id_, GetInputRouterConfigForPlatform()));
+ process_, this, this, routing_id_,
+ GetInputRouterConfigForPlatform(using_browser_compositor)));
synthetic_gesture_controller_.reset();
}
« no previous file with comments | « content/browser/renderer_host/input/input_router_config_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698