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 <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
787 | 787 |
788 void RenderWidget::OnRequestMoveAck() { | 788 void RenderWidget::OnRequestMoveAck() { |
789 DCHECK(pending_window_rect_count_); | 789 DCHECK(pending_window_rect_count_); |
790 pending_window_rect_count_--; | 790 pending_window_rect_count_--; |
791 } | 791 } |
792 | 792 |
793 GURL RenderWidget::GetURLForGraphicsContext3D() { | 793 GURL RenderWidget::GetURLForGraphicsContext3D() { |
794 return GURL(); | 794 return GURL(); |
795 } | 795 } |
796 | 796 |
797 void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event, | 797 void RenderWidget::OnHandleInputEvent( |
798 const ui::LatencyInfo& latency_info, | 798 const blink::WebInputEvent* input_event, |
799 InputEventDispatchType dispatch_type) { | 799 const std::vector<const blink::WebInputEvent*>& coalescedEvents, |
| 800 const ui::LatencyInfo& latency_info, |
| 801 InputEventDispatchType dispatch_type) { |
800 if (!input_event) | 802 if (!input_event) |
801 return; | 803 return; |
802 input_handler_->HandleInputEvent(*input_event, latency_info, dispatch_type); | 804 input_handler_->HandleInputEvent(blink::CoalescedWebInputEvent( |
| 805 *input_event, coalescedEvents)), latency_info, dispatch_type); |
803 } | 806 } |
804 | 807 |
805 void RenderWidget::OnCursorVisibilityChange(bool is_visible) { | 808 void RenderWidget::OnCursorVisibilityChange(bool is_visible) { |
806 if (GetWebWidget()) | 809 if (GetWebWidget()) |
807 GetWebWidget()->setCursorVisibilityState(is_visible); | 810 GetWebWidget()->setCursorVisibilityState(is_visible); |
808 } | 811 } |
809 | 812 |
810 void RenderWidget::OnMouseCaptureLost() { | 813 void RenderWidget::OnMouseCaptureLost() { |
811 if (GetWebWidget()) | 814 if (GetWebWidget()) |
812 GetWebWidget()->mouseCaptureLost(); | 815 GetWebWidget()->mouseCaptureLost(); |
(...skipping 1492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2305 blink::WebInputMethodController* RenderWidget::GetInputMethodController() | 2308 blink::WebInputMethodController* RenderWidget::GetInputMethodController() |
2306 const { | 2309 const { |
2307 // TODO(ekaramad): Remove this CHECK when GetWebWidget() is | 2310 // TODO(ekaramad): Remove this CHECK when GetWebWidget() is |
2308 // always a WebFrameWidget. | 2311 // always a WebFrameWidget. |
2309 CHECK(GetWebWidget()->isWebFrameWidget()); | 2312 CHECK(GetWebWidget()->isWebFrameWidget()); |
2310 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2313 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
2311 ->getActiveWebInputMethodController(); | 2314 ->getActiveWebInputMethodController(); |
2312 } | 2315 } |
2313 | 2316 |
2314 } // namespace content | 2317 } // namespace content |
OLD | NEW |