| Index: cc/surfaces/display.cc
|
| diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
|
| index ef9802c30dd697463f0536f912f7f002a4daf806..2cdcfcd1937e8455c55be9dfd01ae973209ddbb2 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 &&
|
|
|