diff options
author | danakj <danakj@chromium.org> | 2015-11-18 12:39:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 20:39:58 +0000 |
commit | a04855af140e24ed3ec3f59da178837b3d32d9c4 (patch) | |
tree | a71f13ff7f62616eaf173d13861472f06a50fcf2 /cc/surfaces/display.cc | |
parent | 904f19454a71c733205d9e68bc8faa93a6fdce3e (diff) | |
download | chromium_src-a04855af140e24ed3ec3f59da178837b3d32d9c4.zip chromium_src-a04855af140e24ed3ec3f59da178837b3d32d9c4.tar.gz chromium_src-a04855af140e24ed3ec3f59da178837b3d32d9c4.tar.bz2 |
cc: Replace Pass() with std::move() in some subdirs.
This hits the following:
cc/layers/
cc/output/
cc/quads/
cc/resources/
cc/scheduler/
cc/surfaces/
cc/trees/
R=enne, vmpstr
BUG=557422
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1455023002
Cr-Commit-Position: refs/heads/master@{#360405}
Diffstat (limited to 'cc/surfaces/display.cc')
-rw-r--r-- | cc/surfaces/display.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc index ef9802c3..2cdcfcd 100644 --- a/cc/surfaces/display.cc +++ b/cc/surfaces/display.cc @@ -54,7 +54,7 @@ Display::~Display() { bool Display::Initialize(scoped_ptr<OutputSurface> output_surface, DisplayScheduler* scheduler) { - output_surface_ = output_surface.Pass(); + output_surface_ = std::move(output_surface); scheduler_ = scheduler; return output_surface_->BindToClient(this); } @@ -118,16 +118,16 @@ void Display::InitializeRenderer() { texture_mailbox_deleter_.get(), settings_.highp_threshold_min); if (!renderer) return; - renderer_ = renderer.Pass(); + renderer_ = std::move(renderer); } else { scoped_ptr<SoftwareRenderer> renderer = SoftwareRenderer::Create( this, &settings_, output_surface_.get(), resource_provider.get()); if (!renderer) return; - renderer_ = renderer.Pass(); + renderer_ = std::move(renderer); } - resource_provider_ = resource_provider.Pass(); + resource_provider_ = std::move(resource_provider); // TODO(jbauman): Outputting an incomplete quad list doesn't work when using // overlays. bool output_partial_list = renderer_->Capabilities().using_partial_swap && |