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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 1579863003: Convert Pass()→std::move() for Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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_mac.h" 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
6 6
7 #import <objc/runtime.h> 7 #import <objc/runtime.h>
8 #include <OpenGL/gl.h> 8 #include <OpenGL/gl.h>
9 #include <QuartzCore/QuartzCore.h> 9 #include <QuartzCore/QuartzCore.h>
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 "RenderWidgetHostViewMac::DestroyBrowserCompositorView"); 650 "RenderWidgetHostViewMac::DestroyBrowserCompositorView");
651 651
652 // Transition from Active -> Suspended if need be. 652 // Transition from Active -> Suspended if need be.
653 SuspendBrowserCompositorView(); 653 SuspendBrowserCompositorView();
654 654
655 // Destroy the BrowserCompositorView to transition Suspended -> Destroyed. 655 // Destroy the BrowserCompositorView to transition Suspended -> Destroyed.
656 if (browser_compositor_state_ == BrowserCompositorSuspended) { 656 if (browser_compositor_state_ == BrowserCompositorSuspended) {
657 browser_compositor_->accelerated_widget_mac()->ResetNSView(); 657 browser_compositor_->accelerated_widget_mac()->ResetNSView();
658 browser_compositor_->compositor()->SetScaleAndSize(1.0, gfx::Size(0, 0)); 658 browser_compositor_->compositor()->SetScaleAndSize(1.0, gfx::Size(0, 0));
659 browser_compositor_->compositor()->SetRootLayer(nullptr); 659 browser_compositor_->compositor()->SetRootLayer(nullptr);
660 BrowserCompositorMac::Recycle(browser_compositor_.Pass()); 660 BrowserCompositorMac::Recycle(std::move(browser_compositor_));
661 browser_compositor_state_ = BrowserCompositorDestroyed; 661 browser_compositor_state_ = BrowserCompositorDestroyed;
662 } 662 }
663 } 663 }
664 664
665 void RenderWidgetHostViewMac::DestroySuspendedBrowserCompositorViewIfNeeded() { 665 void RenderWidgetHostViewMac::DestroySuspendedBrowserCompositorViewIfNeeded() {
666 if (browser_compositor_state_ != BrowserCompositorSuspended) 666 if (browser_compositor_state_ != BrowserCompositorSuspended)
667 return; 667 return;
668 668
669 // If this view is in a window that is visible, keep around the suspended 669 // If this view is in a window that is visible, keep around the suspended
670 // BrowserCompositorView in case |cocoa_view_| is suddenly revealed (so that 670 // BrowserCompositorView in case |cocoa_view_| is suddenly revealed (so that
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 } 1243 }
1244 1244
1245 bool RenderWidgetHostViewMac::CanCopyToVideoFrame() const { 1245 bool RenderWidgetHostViewMac::CanCopyToVideoFrame() const {
1246 DCHECK(delegated_frame_host_); 1246 DCHECK(delegated_frame_host_);
1247 return delegated_frame_host_->CanCopyToVideoFrame(); 1247 return delegated_frame_host_->CanCopyToVideoFrame();
1248 } 1248 }
1249 1249
1250 void RenderWidgetHostViewMac::BeginFrameSubscription( 1250 void RenderWidgetHostViewMac::BeginFrameSubscription(
1251 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) { 1251 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) {
1252 DCHECK(delegated_frame_host_); 1252 DCHECK(delegated_frame_host_);
1253 delegated_frame_host_->BeginFrameSubscription(subscriber.Pass()); 1253 delegated_frame_host_->BeginFrameSubscription(std::move(subscriber));
1254 } 1254 }
1255 1255
1256 void RenderWidgetHostViewMac::EndFrameSubscription() { 1256 void RenderWidgetHostViewMac::EndFrameSubscription() {
1257 DCHECK(delegated_frame_host_); 1257 DCHECK(delegated_frame_host_);
1258 delegated_frame_host_->EndFrameSubscription(); 1258 delegated_frame_host_->EndFrameSubscription();
1259 } 1259 }
1260 1260
1261 void RenderWidgetHostViewMac::ForwardMouseEvent(const WebMouseEvent& event) { 1261 void RenderWidgetHostViewMac::ForwardMouseEvent(const WebMouseEvent& event) {
1262 if (render_widget_host_) 1262 if (render_widget_host_)
1263 render_widget_host_->ForwardMouseEvent(event); 1263 render_widget_host_->ForwardMouseEvent(event);
(...skipping 2174 matching lines...) Expand 10 before | Expand all | Expand 10 after
3438 3438
3439 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding 3439 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
3440 // regions that are not draggable. (See ControlRegionView in 3440 // regions that are not draggable. (See ControlRegionView in
3441 // native_app_window_cocoa.mm). This requires the render host view to be 3441 // native_app_window_cocoa.mm). This requires the render host view to be
3442 // draggable by default. 3442 // draggable by default.
3443 - (BOOL)mouseDownCanMoveWindow { 3443 - (BOOL)mouseDownCanMoveWindow {
3444 return YES; 3444 return YES;
3445 } 3445 }
3446 3446
3447 @end 3447 @end
OLDNEW
« no previous file with comments | « content/browser/device_sensors/ambient_light_mac.cc ('k') | content/browser/web_contents/web_drag_source_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698