| Index: cc/output/output_surface.cc
|
| diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
|
| index d41c1958bd53cfcf334c6ff5f80a1c190a6a7544..3430d18112814bbae01a7929313c104a9b0c39d6 100644
|
| --- a/cc/output/output_surface.cc
|
| +++ b/cc/output/output_surface.cc
|
| @@ -122,7 +122,7 @@ OutputSurface::OutputSurface(
|
| : client_(NULL),
|
| context_provider_(context_provider),
|
| worker_context_provider_(worker_context_provider),
|
| - software_device_(software_device.Pass()),
|
| + software_device_(std::move(software_device)),
|
| device_scale_factor_(-1),
|
| external_stencil_test_enabled_(false),
|
| weak_ptr_factory_(this) {
|
| @@ -141,14 +141,12 @@ OutputSurface::OutputSurface(
|
| }
|
|
|
| OutputSurface::OutputSurface(scoped_ptr<SoftwareOutputDevice> software_device)
|
| - : OutputSurface(nullptr, nullptr, software_device.Pass()) {
|
| -}
|
| + : OutputSurface(nullptr, nullptr, std::move(software_device)) {}
|
|
|
| OutputSurface::OutputSurface(
|
| const scoped_refptr<ContextProvider>& context_provider,
|
| scoped_ptr<SoftwareOutputDevice> software_device)
|
| - : OutputSurface(context_provider, nullptr, software_device.Pass()) {
|
| -}
|
| + : OutputSurface(context_provider, nullptr, std::move(software_device)) {}
|
|
|
| void OutputSurface::CommitVSyncParameters(base::TimeTicks timebase,
|
| base::TimeDelta interval) {
|
|
|