Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2815823003: Notify OverscrollController of gesture events in plugins. (Closed)
Patch Set: Rebase. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 // of indicating that touchpad scroll has ended, we don't actually want 1108 // of indicating that touchpad scroll has ended, we don't actually want
1109 // a fling animation. Note: Similar code exists in 1109 // a fling animation. Note: Similar code exists in
1110 // RenderWidgetHostViewChildFrame::FilterInputEvent() 1110 // RenderWidgetHostViewChildFrame::FilterInputEvent()
1111 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS; 1111 return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
1112 } 1112 }
1113 1113
1114 return consumed ? INPUT_EVENT_ACK_STATE_CONSUMED 1114 return consumed ? INPUT_EVENT_ACK_STATE_CONSUMED
1115 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 1115 : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
1116 } 1116 }
1117 1117
1118 InputEventAckState RenderWidgetHostViewAura::FilterChildGestureEvent(
1119 const blink::WebGestureEvent& gesture_event) {
1120 if (overscroll_controller_ &&
1121 overscroll_controller_->WillHandleEvent(gesture_event))
1122 return INPUT_EVENT_ACK_STATE_CONSUMED;
1123 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
1124 }
1125
1118 BrowserAccessibilityManager* 1126 BrowserAccessibilityManager*
1119 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager( 1127 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager(
1120 BrowserAccessibilityDelegate* delegate, bool for_root_frame) { 1128 BrowserAccessibilityDelegate* delegate, bool for_root_frame) {
1121 BrowserAccessibilityManager* manager = NULL; 1129 BrowserAccessibilityManager* manager = NULL;
1122 #if defined(OS_WIN) 1130 #if defined(OS_WIN)
1123 manager = new BrowserAccessibilityManagerWin( 1131 manager = new BrowserAccessibilityManagerWin(
1124 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate); 1132 BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate);
1125 #else 1133 #else
1126 manager = BrowserAccessibilityManager::Create( 1134 manager = BrowserAccessibilityManager::Create(
1127 BrowserAccessibilityManager::GetEmptyDocument(), delegate); 1135 BrowserAccessibilityManager::GetEmptyDocument(), delegate);
(...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after
2406 } 2414 }
2407 2415
2408 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { 2416 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() {
2409 if (!delegated_frame_host_) 2417 if (!delegated_frame_host_)
2410 return; 2418 return;
2411 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || 2419 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ ||
2412 needs_flush_input_); 2420 needs_flush_input_);
2413 } 2421 }
2414 2422
2415 } // namespace content 2423 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698