| 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_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1217 host->dispatcher()->ProcessedTouchEvent((*iter), window_, result); | 1217 host->dispatcher()->ProcessedTouchEvent((*iter), window_, result); |
| 1218 } | 1218 } |
| 1219 } | 1219 } |
| 1220 | 1220 |
| 1221 scoped_ptr<SyntheticGestureTarget> | 1221 scoped_ptr<SyntheticGestureTarget> |
| 1222 RenderWidgetHostViewAura::CreateSyntheticGestureTarget() { | 1222 RenderWidgetHostViewAura::CreateSyntheticGestureTarget() { |
| 1223 return scoped_ptr<SyntheticGestureTarget>( | 1223 return scoped_ptr<SyntheticGestureTarget>( |
| 1224 new SyntheticGestureTargetAura(host_)); | 1224 new SyntheticGestureTargetAura(host_)); |
| 1225 } | 1225 } |
| 1226 | 1226 |
| 1227 void RenderWidgetHostViewAura::SetScrollOffsetPinning( | |
| 1228 bool is_pinned_to_left, bool is_pinned_to_right) { | |
| 1229 // Not needed. Mac-only. | |
| 1230 } | |
| 1231 | |
| 1232 InputEventAckState RenderWidgetHostViewAura::FilterInputEvent( | 1227 InputEventAckState RenderWidgetHostViewAura::FilterInputEvent( |
| 1233 const blink::WebInputEvent& input_event) { | 1228 const blink::WebInputEvent& input_event) { |
| 1234 bool consumed = false; | 1229 bool consumed = false; |
| 1235 if (input_event.type == WebInputEvent::GestureFlingStart) { | 1230 if (input_event.type == WebInputEvent::GestureFlingStart) { |
| 1236 const WebGestureEvent& gesture_event = | 1231 const WebGestureEvent& gesture_event = |
| 1237 static_cast<const WebGestureEvent&>(input_event); | 1232 static_cast<const WebGestureEvent&>(input_event); |
| 1238 // Zero-velocity touchpad flings are an Aura-specific signal that the | 1233 // Zero-velocity touchpad flings are an Aura-specific signal that the |
| 1239 // touchpad scroll has ended, and should not be forwarded to the renderer. | 1234 // touchpad scroll has ended, and should not be forwarded to the renderer. |
| 1240 if (gesture_event.sourceDevice == blink::WebGestureDeviceTouchpad && | 1235 if (gesture_event.sourceDevice == blink::WebGestureDeviceTouchpad && |
| 1241 !gesture_event.data.flingStart.velocityX && | 1236 !gesture_event.data.flingStart.velocityX && |
| (...skipping 1221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2463 | 2458 |
| 2464 //////////////////////////////////////////////////////////////////////////////// | 2459 //////////////////////////////////////////////////////////////////////////////// |
| 2465 // RenderWidgetHostViewBase, public: | 2460 // RenderWidgetHostViewBase, public: |
| 2466 | 2461 |
| 2467 // static | 2462 // static |
| 2468 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2463 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2469 GetScreenInfoForWindow(results, NULL); | 2464 GetScreenInfoForWindow(results, NULL); |
| 2470 } | 2465 } |
| 2471 | 2466 |
| 2472 } // namespace content | 2467 } // namespace content |
| OLD | NEW |