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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1102 // of indicating that touchpad scroll has ended, we don't actually want | 1102 // of indicating that touchpad scroll has ended, we don't actually want |
1103 // a fling animation. Note: Similar code exists in | 1103 // a fling animation. Note: Similar code exists in |
1104 // RenderWidgetHostViewChildFrame::FilterInputEvent() | 1104 // RenderWidgetHostViewChildFrame::FilterInputEvent() |
1105 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; | 1105 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; |
1106 } | 1106 } |
1107 | 1107 |
1108 return consumed ? INPUT_EVENT_ACK_STATE_CONSUMED | 1108 return consumed ? INPUT_EVENT_ACK_STATE_CONSUMED |
1109 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 1109 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
1110 } | 1110 } |
1111 | 1111 |
| 1112 InputEventAckState RenderWidgetHostViewAura::FilterChildGestureEvent( |
| 1113 const blink::WebGestureEvent& gesture_event) { |
| 1114 if (overscroll_controller_ && |
| 1115 overscroll_controller_->WillHandleEvent(gesture_event)) |
| 1116 return INPUT_EVENT_ACK_STATE_CONSUMED; |
| 1117 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| 1118 } |
| 1119 |
1112 BrowserAccessibilityManager* | 1120 BrowserAccessibilityManager* |
1113 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( | 1121 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( |
1114 BrowserAccessibilityDelegate* delegate, bool for_root_frame) { | 1122 BrowserAccessibilityDelegate* delegate, bool for_root_frame) { |
1115 BrowserAccessibilityManager* manager = NULL; | 1123 BrowserAccessibilityManager* manager = NULL; |
1116 #if defined(OS_WIN) | 1124 #if defined(OS_WIN) |
1117 manager = new BrowserAccessibilityManagerWin( | 1125 manager = new BrowserAccessibilityManagerWin( |
1118 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); | 1126 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); |
1119 #else | 1127 #else |
1120 manager = BrowserAccessibilityManager::Create( | 1128 manager = BrowserAccessibilityManager::Create( |
1121 BrowserAccessibilityManager::GetEmptyDocument(), delegate); | 1129 BrowserAccessibilityManager::GetEmptyDocument(), delegate); |
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2374 } | 2382 } |
2375 | 2383 |
2376 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2384 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
2377 if (!delegated_frame_host_) | 2385 if (!delegated_frame_host_) |
2378 return; | 2386 return; |
2379 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || | 2387 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || |
2380 needs_flush_input_); | 2388 needs_flush_input_); |
2381 } | 2389 } |
2382 | 2390 |
2383 } // namespace content | 2391 } // namespace content |
OLD | NEW |