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 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1136 return false; | 1136 return false; |
1137 } | 1137 } |
1138 | 1138 |
1139 bool RenderWidget::WillHandleMouseEvent(const blink::WebMouseEvent& event) { | 1139 bool RenderWidget::WillHandleMouseEvent(const blink::WebMouseEvent& event) { |
1140 for (auto& observer : render_frames_) | 1140 for (auto& observer : render_frames_) |
1141 observer.RenderWidgetWillHandleMouseEvent(); | 1141 observer.RenderWidgetWillHandleMouseEvent(); |
1142 | 1142 |
1143 possible_drag_event_info_.event_source = | 1143 possible_drag_event_info_.event_source = |
1144 ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE; | 1144 ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE; |
1145 possible_drag_event_info_.event_location = | 1145 possible_drag_event_info_.event_location = |
1146 gfx::Point(event.globalX, event.globalY); | 1146 gfx::Point(event.positionInScreen().x, event.positionInScreen().y); |
1147 | 1147 |
1148 if (owner_delegate_) | 1148 if (owner_delegate_) |
1149 return owner_delegate_->RenderWidgetWillHandleMouseEvent(event); | 1149 return owner_delegate_->RenderWidgetWillHandleMouseEvent(event); |
1150 | 1150 |
1151 return false; | 1151 return false; |
1152 } | 1152 } |
1153 | 1153 |
1154 /////////////////////////////////////////////////////////////////////////////// | 1154 /////////////////////////////////////////////////////////////////////////////// |
1155 // RenderWidgetScreenMetricsDelegate | 1155 // RenderWidgetScreenMetricsDelegate |
1156 | 1156 |
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2338 // browser side (https://crbug.com/669219). | 2338 // browser side (https://crbug.com/669219). |
2339 // If there is no WebFrameWidget, then there will be no | 2339 // If there is no WebFrameWidget, then there will be no |
2340 // InputMethodControllers for a WebLocalFrame. | 2340 // InputMethodControllers for a WebLocalFrame. |
2341 return nullptr; | 2341 return nullptr; |
2342 } | 2342 } |
2343 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2343 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
2344 ->getActiveWebInputMethodController(); | 2344 ->getActiveWebInputMethodController(); |
2345 } | 2345 } |
2346 | 2346 |
2347 } // namespace content | 2347 } // namespace content |
OLD | NEW |