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

Side by Side Diff: content/renderer/render_widget.cc

Issue 1780953003: Change the non-blocking event queue to the main thread event queue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_wheel_regression_5
Patch Set: Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 } 984 }
985 985
986 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { 986 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) {
987 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); 987 Send(new InputHostMsg_DidOverscroll(routing_id_, params));
988 } 988 }
989 989
990 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) { 990 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) {
991 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); 991 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack));
992 } 992 }
993 993
994 void RenderWidget::NonBlockingInputEventHandled( 994 void RenderWidget::NotifyInputEventHandled(
995 blink::WebInputEvent::Type handled_type) { 995 blink::WebInputEvent::Type handled_type) {
996 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 996 RenderThreadImpl* render_thread = RenderThreadImpl::current();
997 InputHandlerManager* input_handler_manager = 997 InputHandlerManager* input_handler_manager =
998 render_thread ? render_thread->input_handler_manager() : NULL; 998 render_thread ? render_thread->input_handler_manager() : NULL;
999 if (input_handler_manager) { 999 if (input_handler_manager) {
1000 input_handler_manager->NonBlockingInputEventHandledOnMainThread( 1000 input_handler_manager->NotifyInputEventHandledOnMainThread(routing_id_,
1001 routing_id_, handled_type); 1001 handled_type);
1002 } 1002 }
1003 } 1003 }
1004 1004
1005 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { 1005 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) {
1006 // Nothing to do here. RenderWidget created the |input_handler| and will take 1006 // Nothing to do here. RenderWidget created the |input_handler| and will take
1007 // ownership of it. We just verify here that we don't already have an input 1007 // ownership of it. We just verify here that we don't already have an input
1008 // handler. 1008 // handler.
1009 DCHECK(!input_handler_); 1009 DCHECK(!input_handler_);
1010 } 1010 }
1011 1011
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after
2190 } 2190 }
2191 2191
2192 float RenderWidget::GetOriginalDeviceScaleFactor() const { 2192 float RenderWidget::GetOriginalDeviceScaleFactor() const {
2193 return 2193 return
2194 screen_metrics_emulator_ ? 2194 screen_metrics_emulator_ ?
2195 screen_metrics_emulator_->original_screen_info().deviceScaleFactor : 2195 screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
2196 device_scale_factor_; 2196 device_scale_factor_;
2197 } 2197 }
2198 2198
2199 } // namespace content 2199 } // namespace content
OLDNEW
« content/renderer/input/main_thread_event_queue.h ('K') | « content/renderer/render_widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698