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

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

Issue 2658293002: content: Remove Lock/Unlock CompositingSurface API from RWH. (Closed)
Patch Set: mac Created 3 years, 10 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 2243 matching lines...) Expand 10 before | Expand all | Expand 10 after
2254 ->max_touch_move_in_pixels_for_click(); 2254 ->max_touch_move_in_pixels_for_click();
2255 tsc_config.enable_longpress_drag_selection = false; 2255 tsc_config.enable_longpress_drag_selection = false;
2256 selection_controller_.reset(new ui::TouchSelectionController( 2256 selection_controller_.reset(new ui::TouchSelectionController(
2257 selection_controller_client_.get(), tsc_config)); 2257 selection_controller_client_.get(), tsc_config));
2258 } 2258 }
2259 2259
2260 void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() { 2260 void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() {
2261 ui::GestureRecognizer::Get()->CancelActiveTouches(window_); 2261 ui::GestureRecognizer::Get()->CancelActiveTouches(window_);
2262 } 2262 }
2263 2263
2264 void RenderWidgetHostViewAura::LockCompositingSurface() {
2265 NOTIMPLEMENTED();
2266 }
2267
2268 void RenderWidgetHostViewAura::UnlockCompositingSurface() {
2269 NOTIMPLEMENTED();
2270 }
2271
2272 cc::FrameSinkId RenderWidgetHostViewAura::GetFrameSinkId() { 2264 cc::FrameSinkId RenderWidgetHostViewAura::GetFrameSinkId() {
2273 return delegated_frame_host_ ? delegated_frame_host_->GetFrameSinkId() 2265 return delegated_frame_host_ ? delegated_frame_host_->GetFrameSinkId()
2274 : cc::FrameSinkId(); 2266 : cc::FrameSinkId();
2275 } 2267 }
2276 2268
2277 cc::SurfaceId RenderWidgetHostViewAura::SurfaceIdForTesting() const { 2269 cc::SurfaceId RenderWidgetHostViewAura::SurfaceIdForTesting() const {
2278 return delegated_frame_host_ ? delegated_frame_host_->SurfaceIdForTesting() 2270 return delegated_frame_host_ ? delegated_frame_host_->SurfaceIdForTesting()
2279 : cc::SurfaceId(); 2271 : cc::SurfaceId();
2280 } 2272 }
2281 2273
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
2374 2366
2375 void RenderWidgetHostViewAura::SetPopupChild( 2367 void RenderWidgetHostViewAura::SetPopupChild(
2376 RenderWidgetHostViewAura* popup_child_host_view) { 2368 RenderWidgetHostViewAura* popup_child_host_view) {
2377 popup_child_host_view_ = popup_child_host_view; 2369 popup_child_host_view_ = popup_child_host_view;
2378 event_handler_->SetPopupChild( 2370 event_handler_->SetPopupChild(
2379 popup_child_host_view, 2371 popup_child_host_view,
2380 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr); 2372 popup_child_host_view ? popup_child_host_view->event_handler() : nullptr);
2381 } 2373 }
2382 2374
2383 } // namespace content 2375 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698