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/browser/renderer_host/render_widget_host_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 | 134 |
135 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostIteratorImpl); | 135 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostIteratorImpl); |
136 }; | 136 }; |
137 | 137 |
138 inline blink::WebGestureEvent CreateScrollBeginForWrapping( | 138 inline blink::WebGestureEvent CreateScrollBeginForWrapping( |
139 const blink::WebGestureEvent& gesture_event) { | 139 const blink::WebGestureEvent& gesture_event) { |
140 DCHECK(gesture_event.type == blink::WebInputEvent::GestureScrollUpdate); | 140 DCHECK(gesture_event.type == blink::WebInputEvent::GestureScrollUpdate); |
141 | 141 |
142 blink::WebGestureEvent wrap_gesture_scroll_begin; | 142 blink::WebGestureEvent wrap_gesture_scroll_begin; |
143 wrap_gesture_scroll_begin.type = blink::WebInputEvent::GestureScrollBegin; | 143 wrap_gesture_scroll_begin.type = blink::WebInputEvent::GestureScrollBegin; |
| 144 wrap_gesture_scroll_begin.sourceDevice = gesture_event.sourceDevice; |
144 wrap_gesture_scroll_begin.data.scrollBegin.deltaXHint = 0; | 145 wrap_gesture_scroll_begin.data.scrollBegin.deltaXHint = 0; |
145 wrap_gesture_scroll_begin.data.scrollBegin.deltaYHint = 0; | 146 wrap_gesture_scroll_begin.data.scrollBegin.deltaYHint = 0; |
146 wrap_gesture_scroll_begin.resendingPluginId = gesture_event.resendingPluginId; | 147 wrap_gesture_scroll_begin.resendingPluginId = gesture_event.resendingPluginId; |
147 | 148 |
148 return wrap_gesture_scroll_begin; | 149 return wrap_gesture_scroll_begin; |
149 } | 150 } |
150 | 151 |
151 inline blink::WebGestureEvent CreateScrollEndForWrapping( | 152 inline blink::WebGestureEvent CreateScrollEndForWrapping( |
152 const blink::WebGestureEvent& gesture_event) { | 153 const blink::WebGestureEvent& gesture_event) { |
153 DCHECK(gesture_event.type == blink::WebInputEvent::GestureScrollUpdate); | 154 DCHECK(gesture_event.type == blink::WebInputEvent::GestureScrollUpdate); |
154 | 155 |
155 blink::WebGestureEvent wrap_gesture_scroll_end; | 156 blink::WebGestureEvent wrap_gesture_scroll_end; |
156 wrap_gesture_scroll_end.type = blink::WebInputEvent::GestureScrollEnd; | 157 wrap_gesture_scroll_end.type = blink::WebInputEvent::GestureScrollEnd; |
| 158 wrap_gesture_scroll_end.sourceDevice = gesture_event.sourceDevice; |
157 wrap_gesture_scroll_end.resendingPluginId = gesture_event.resendingPluginId; | 159 wrap_gesture_scroll_end.resendingPluginId = gesture_event.resendingPluginId; |
158 | 160 |
159 return wrap_gesture_scroll_end; | 161 return wrap_gesture_scroll_end; |
160 } | 162 } |
161 | 163 |
162 } // namespace | 164 } // namespace |
163 | 165 |
164 /////////////////////////////////////////////////////////////////////////////// | 166 /////////////////////////////////////////////////////////////////////////////// |
165 // RenderWidgetHostImpl | 167 // RenderWidgetHostImpl |
166 | 168 |
(...skipping 2017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2184 } | 2186 } |
2185 | 2187 |
2186 #if defined(OS_WIN) | 2188 #if defined(OS_WIN) |
2187 gfx::NativeViewAccessible | 2189 gfx::NativeViewAccessible |
2188 RenderWidgetHostImpl::GetParentNativeViewAccessible() { | 2190 RenderWidgetHostImpl::GetParentNativeViewAccessible() { |
2189 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; | 2191 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; |
2190 } | 2192 } |
2191 #endif | 2193 #endif |
2192 | 2194 |
2193 } // namespace content | 2195 } // namespace content |
OLD | NEW |