| OLD | NEW |
| 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 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 958 void RenderWidget::OnRequestMoveAck() { | 958 void RenderWidget::OnRequestMoveAck() { |
| 959 DCHECK(pending_window_rect_count_); | 959 DCHECK(pending_window_rect_count_); |
| 960 pending_window_rect_count_--; | 960 pending_window_rect_count_--; |
| 961 } | 961 } |
| 962 | 962 |
| 963 GURL RenderWidget::GetURLForGraphicsContext3D() { | 963 GURL RenderWidget::GetURLForGraphicsContext3D() { |
| 964 return GURL(); | 964 return GURL(); |
| 965 } | 965 } |
| 966 | 966 |
| 967 void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event, | 967 void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event, |
| 968 const ui::LatencyInfo& latency_info) { | 968 const ui::LatencyInfo& latency_info, |
| 969 bool passive) { |
| 969 if (!input_event) | 970 if (!input_event) |
| 970 return; | 971 return; |
| 971 input_handler_->HandleInputEvent(*input_event, latency_info); | 972 input_handler_->HandleInputEvent(*input_event, latency_info, passive); |
| 972 } | 973 } |
| 973 | 974 |
| 974 void RenderWidget::OnCursorVisibilityChange(bool is_visible) { | 975 void RenderWidget::OnCursorVisibilityChange(bool is_visible) { |
| 975 if (webwidget_) | 976 if (webwidget_) |
| 976 webwidget_->setCursorVisibilityState(is_visible); | 977 webwidget_->setCursorVisibilityState(is_visible); |
| 977 } | 978 } |
| 978 | 979 |
| 979 void RenderWidget::OnMouseCaptureLost() { | 980 void RenderWidget::OnMouseCaptureLost() { |
| 980 if (webwidget_) | 981 if (webwidget_) |
| 981 webwidget_->mouseCaptureLost(); | 982 webwidget_->mouseCaptureLost(); |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1258 void RenderWidget::OnDidHandleKeyEvent() {} | 1259 void RenderWidget::OnDidHandleKeyEvent() {} |
| 1259 | 1260 |
| 1260 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { | 1261 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { |
| 1261 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); | 1262 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); |
| 1262 } | 1263 } |
| 1263 | 1264 |
| 1264 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) { | 1265 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) { |
| 1265 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); | 1266 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); |
| 1266 } | 1267 } |
| 1267 | 1268 |
| 1269 void RenderWidget::PassiveInputEventHandled( |
| 1270 blink::WebInputEvent::Type handled_type) { |
| 1271 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 1272 InputHandlerManager* input_handler_manager = |
| 1273 render_thread ? render_thread->input_handler_manager() : NULL; |
| 1274 if (input_handler_manager) { |
| 1275 input_handler_manager->PassiveInputEventHandledOnMainThread(routing_id_, |
| 1276 handled_type); |
| 1277 } |
| 1278 } |
| 1279 |
| 1268 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { | 1280 void RenderWidget::SetInputHandler(RenderWidgetInputHandler* input_handler) { |
| 1269 // Nothing to do here. RenderWidget created the |input_handler| and will take | 1281 // Nothing to do here. RenderWidget created the |input_handler| and will take |
| 1270 // ownership of it. We just verify here that we don't already have an input | 1282 // ownership of it. We just verify here that we don't already have an input |
| 1271 // handler. | 1283 // handler. |
| 1272 DCHECK(!input_handler_); | 1284 DCHECK(!input_handler_); |
| 1273 } | 1285 } |
| 1274 | 1286 |
| 1275 void RenderWidget::UpdateTextInputState(ShowIme show_ime, | 1287 void RenderWidget::UpdateTextInputState(ShowIme show_ime, |
| 1276 ChangeSource change_source) { | 1288 ChangeSource change_source) { |
| 1277 TRACE_EVENT0("renderer", "RenderWidget::UpdateTextInputState"); | 1289 TRACE_EVENT0("renderer", "RenderWidget::UpdateTextInputState"); |
| (...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2271 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2283 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2272 video_hole_frames_.AddObserver(frame); | 2284 video_hole_frames_.AddObserver(frame); |
| 2273 } | 2285 } |
| 2274 | 2286 |
| 2275 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2287 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2276 video_hole_frames_.RemoveObserver(frame); | 2288 video_hole_frames_.RemoveObserver(frame); |
| 2277 } | 2289 } |
| 2278 #endif // defined(VIDEO_HOLE) | 2290 #endif // defined(VIDEO_HOLE) |
| 2279 | 2291 |
| 2280 } // namespace content | 2292 } // namespace content |
| OLD | NEW |