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

Unified Diff: content/renderer/render_view_impl.cc

Issue 2060713002: Respect the order of input messages from browser to renderer (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2743
Patch Set: Created 4 years, 6 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/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6e9efe7da12de6f1c28011a48d2b0a4832cd7f00..c6c6a4991ced8372243e4604c61a3004ec987ccd 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -659,7 +659,8 @@ RenderViewImpl::RenderViewImpl(CompositorDependencies* compositor_deps,
expected_content_intent_id_(0),
#endif
enumeration_completion_id_(0),
- session_storage_namespace_id_(params.session_storage_namespace_id) {
+ session_storage_namespace_id_(params.session_storage_namespace_id),
+ has_added_input_handler_(false) {
GetWidget()->set_owner_delegate(this);
}
@@ -2051,17 +2052,19 @@ void RenderViewImpl::initializeLayerTreeView() {
// (SnowLeopard, which has Aqua scrollbars which need synchronous updates).
use_threaded_event_handling = compositor_deps_->IsElasticOverscrollEnabled();
#endif
- if (use_threaded_event_handling) {
- RenderThreadImpl* render_thread = RenderThreadImpl::current();
- // render_thread may be NULL in tests.
- InputHandlerManager* input_handler_manager =
- render_thread ? render_thread->input_handler_manager() : NULL;
- if (input_handler_manager) {
- input_handler_manager->AddInputHandler(
- GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),
- webkit_preferences_.enable_scroll_animator,
- UseGestureBasedWheelScrolling());
- }
+ if (!use_threaded_event_handling)
+ return;
+
+ RenderThreadImpl* render_thread = RenderThreadImpl::current();
+ // render_thread may be NULL in tests.
+ InputHandlerManager* input_handler_manager =
+ render_thread ? render_thread->input_handler_manager() : NULL;
+ if (input_handler_manager) {
+ input_handler_manager->AddInputHandler(
+ GetRoutingID(), rwc->GetInputHandler(), AsWeakPtr(),
+ webkit_preferences_.enable_scroll_animator,
+ UseGestureBasedWheelScrolling());
+ has_added_input_handler_ = true;
}
}
@@ -2214,6 +2217,10 @@ float RenderViewImpl::GetDeviceScaleFactorForTest() const {
return device_scale_factor_;
}
+bool RenderViewImpl::HasAddedInputHandler() const {
+ return has_added_input_handler_;
+}
+
gfx::Point RenderViewImpl::ConvertWindowPointToViewport(
const gfx::Point& point) {
blink::WebFloatRect point_in_viewport(point.x(), point.y(), 0, 0);
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698