| 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 2256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2267 ->max_touch_move_in_pixels_for_click(); | 2267 ->max_touch_move_in_pixels_for_click(); |
| 2268 tsc_config.enable_longpress_drag_selection = false; | 2268 tsc_config.enable_longpress_drag_selection = false; |
| 2269 selection_controller_.reset(new ui::TouchSelectionController( | 2269 selection_controller_.reset(new ui::TouchSelectionController( |
| 2270 selection_controller_client_.get(), tsc_config)); | 2270 selection_controller_client_.get(), tsc_config)); |
| 2271 } | 2271 } |
| 2272 | 2272 |
| 2273 void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() { | 2273 void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() { |
| 2274 ui::GestureRecognizer::Get()->CancelActiveTouches(window_); | 2274 ui::GestureRecognizer::Get()->CancelActiveTouches(window_); |
| 2275 } | 2275 } |
| 2276 | 2276 |
| 2277 void RenderWidgetHostViewAura::LockCompositingSurface() { | |
| 2278 NOTIMPLEMENTED(); | |
| 2279 } | |
| 2280 | |
| 2281 void RenderWidgetHostViewAura::UnlockCompositingSurface() { | |
| 2282 NOTIMPLEMENTED(); | |
| 2283 } | |
| 2284 | |
| 2285 cc::FrameSinkId RenderWidgetHostViewAura::GetFrameSinkId() { | 2277 cc::FrameSinkId RenderWidgetHostViewAura::GetFrameSinkId() { |
| 2286 return delegated_frame_host_ ? delegated_frame_host_->GetFrameSinkId() | 2278 return delegated_frame_host_ ? delegated_frame_host_->GetFrameSinkId() |
| 2287 : cc::FrameSinkId(); | 2279 : cc::FrameSinkId(); |
| 2288 } | 2280 } |
| 2289 | 2281 |
| 2290 cc::SurfaceId RenderWidgetHostViewAura::SurfaceIdForTesting() const { | 2282 cc::SurfaceId RenderWidgetHostViewAura::SurfaceIdForTesting() const { |
| 2291 return delegated_frame_host_ ? delegated_frame_host_->SurfaceIdForTesting() | 2283 return delegated_frame_host_ ? delegated_frame_host_->SurfaceIdForTesting() |
| 2292 : cc::SurfaceId(); | 2284 : cc::SurfaceId(); |
| 2293 } | 2285 } |
| 2294 | 2286 |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2387 | 2379 |
| 2388 void RenderWidgetHostViewAura::SetPopupChild( | 2380 void RenderWidgetHostViewAura::SetPopupChild( |
| 2389 RenderWidgetHostViewAura* popup_child_host_view) { | 2381 RenderWidgetHostViewAura* popup_child_host_view) { |
| 2390 popup_child_host_view_ = popup_child_host_view; | 2382 popup_child_host_view_ = popup_child_host_view; |
| 2391 event_handler_->SetPopupChild( | 2383 event_handler_->SetPopupChild( |
| 2392 popup_child_host_view, | 2384 popup_child_host_view, |
| 2393 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); | 2385 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); |
| 2394 } | 2386 } |
| 2395 | 2387 |
| 2396 } // namespace content | 2388 } // namespace content |
| OLD | NEW |