| Index: cc/output/gl_renderer.cc
|
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
|
| index 2b1b1f28725c55631ce1e89dec3a931a5b85b0b6..280b5544b80e87bad961e1bda5f25a827d4c31fd 100644
|
| --- a/cc/output/gl_renderer.cc
|
| +++ b/cc/output/gl_renderer.cc
|
| @@ -847,7 +847,7 @@ scoped_ptr<ScopedResource> GLRenderer::GetBackdropTexture(
|
| device_background_texture->id());
|
| GetFramebufferTexture(lock.texture_id(), RGBA_8888, bounding_rect);
|
| }
|
| - return device_background_texture.Pass();
|
| + return device_background_texture;
|
| }
|
|
|
| skia::RefPtr<SkImage> GLRenderer::ApplyBackgroundFilters(
|
| @@ -2444,7 +2444,7 @@ void GLRenderer::FinishDrawingFrame(DrawingFrame* frame) {
|
| if (use_sync_query_) {
|
| DCHECK(current_sync_query_);
|
| current_sync_query_->End();
|
| - pending_sync_queries_.push_back(current_sync_query_.Pass());
|
| + pending_sync_queries_.push_back(std::move(current_sync_query_));
|
| }
|
|
|
| current_framebuffer_lock_ = nullptr;
|
| @@ -2497,7 +2497,7 @@ void GLRenderer::CopyCurrentRenderPassToBitmap(
|
| gfx::Rect copy_rect = frame->current_render_pass->output_rect;
|
| if (request->has_area())
|
| copy_rect.Intersect(request->area());
|
| - GetFramebufferPixelsAsync(frame, copy_rect, request.Pass());
|
| + GetFramebufferPixelsAsync(frame, copy_rect, std::move(request));
|
| }
|
|
|
| void GLRenderer::ToGLMatrix(float* gl_matrix, const gfx::Transform& transform) {
|
| @@ -2726,17 +2726,17 @@ void GLRenderer::GetFramebufferPixelsAsync(
|
| gl_->DeleteTextures(1, &texture_id);
|
| }
|
|
|
| - request->SendTextureResult(
|
| - window_rect.size(), texture_mailbox, release_callback.Pass());
|
| + request->SendTextureResult(window_rect.size(), texture_mailbox,
|
| + std::move(release_callback));
|
| return;
|
| }
|
|
|
| DCHECK(request->force_bitmap_result());
|
|
|
| scoped_ptr<PendingAsyncReadPixels> pending_read(new PendingAsyncReadPixels);
|
| - pending_read->copy_request = request.Pass();
|
| + pending_read->copy_request = std::move(request);
|
| pending_async_read_pixels_.insert(pending_async_read_pixels_.begin(),
|
| - pending_read.Pass());
|
| + std::move(pending_read));
|
|
|
| bool do_workaround = NeedsIOSurfaceReadbackWorkaround();
|
|
|
| @@ -2876,7 +2876,7 @@ void GLRenderer::FinishedReadback(unsigned source_buffer,
|
| }
|
|
|
| if (bitmap)
|
| - current_read->copy_request->SendBitmapResult(bitmap.Pass());
|
| + current_read->copy_request->SendBitmapResult(std::move(bitmap));
|
|
|
| // Conversion from reverse iterator to iterator:
|
| // Iterator |iter.base() - 1| points to the same element with reverse iterator
|
|
|