| Index: content/browser/compositor/browser_compositor_output_surface.cc
|
| diff --git a/content/browser/compositor/browser_compositor_output_surface.cc b/content/browser/compositor/browser_compositor_output_surface.cc
|
| index 38c8c26b25a569e2aa39eefb3809281a328f1391..f865702effe067a645bc434c72882385ed5195a5 100644
|
| --- a/content/browser/compositor/browser_compositor_output_surface.cc
|
| +++ b/content/browser/compositor/browser_compositor_output_surface.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/browser/compositor/browser_compositor_output_surface.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/location.h"
|
| @@ -27,18 +29,19 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| use_begin_frame_scheduling_(
|
| base::CommandLine::ForCurrentProcess()
|
| ->HasSwitch(cc::switches::kEnableBeginFrameScheduling)) {
|
| - overlay_candidate_validator_ = overlay_candidate_validator.Pass();
|
| + overlay_candidate_validator_ = std::move(overlay_candidate_validator);
|
| Initialize();
|
| }
|
|
|
| BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
|
| scoped_ptr<cc::SoftwareOutputDevice> software_device,
|
| const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
|
| - : OutputSurface(software_device.Pass()),
|
| + : OutputSurface(std::move(software_device)),
|
| vsync_manager_(vsync_manager),
|
| reflector_(nullptr),
|
| - use_begin_frame_scheduling_(base::CommandLine::ForCurrentProcess()->
|
| - HasSwitch(cc::switches::kEnableBeginFrameScheduling)) {
|
| + use_begin_frame_scheduling_(
|
| + base::CommandLine::ForCurrentProcess()
|
| + ->HasSwitch(cc::switches::kEnableBeginFrameScheduling)) {
|
| Initialize();
|
| }
|
|
|
|
|