chrome/browser/android/thumbnail/thumbnail_cache.cc - Issue 1551033002: Convert Pass()→std::move() in //chrome (Android edition)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/thumbnail/thumbnail_cache.cc

Issue 1551033002: Convert Pass()→std::move() in //chrome (Android edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Enable RVO by making types match Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc ('k') | chrome/browser/autofill/autofill_cc_infobar_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/thumbnail/thumbnail_cache.cc

diff --git a/chrome/browser/android/thumbnail/thumbnail_cache.cc b/chrome/browser/android/thumbnail/thumbnail_cache.cc

index 7fc4d35769811583cc201f3ddcd7ca1fb0963497..3f8e90553e3ee572786f3c160a59b47990d970c1 100644

--- a/chrome/browser/android/thumbnail/thumbnail_cache.cc

+++ b/chrome/browser/android/thumbnail/thumbnail_cache.cc

@@ -6,6 +6,7 @@

#include <algorithm>

#include <cmath>

+#include <utility>

#include "base/android/path_utils.h"

#include "base/big_endian.h"

@@ -173,7 +174,7 @@ void ThumbnailCache::Put(TabId tab_id,

RemoveFromReadQueue(tab_id);

MakeSpaceForNewItemIfNecessary(tab_id);

- cache_.Put(tab_id, thumbnail.Pass());

+ cache_.Put(tab_id, std::move(thumbnail));

if (use_approximation_thumbnail_) {

std::pair<SkBitmap, float> approximation =

@@ -181,7 +182,7 @@ void ThumbnailCache::Put(TabId tab_id,

scoped_ptr<Thumbnail> approx_thumbnail = Thumbnail::Create(

tab_id, time_stamp, approximation.second, ui_resource_provider_, this);

approx_thumbnail->SetBitmap(approximation.first);

- approximation_cache_.Put(tab_id, approx_thumbnail.Pass());

+ approximation_cache_.Put(tab_id, std::move(approx_thumbnail));

}

CompressThumbnailIfNecessary(tab_id, time_stamp, bitmap, thumbnail_scale);

}

@@ -824,7 +825,7 @@ void ThumbnailCache::PostReadTask(TabId tab_id,

if (kPreferCPUMemory)

thumbnail->CreateUIResource();

- cache_.Put(tab_id, thumbnail.Pass());

+ cache_.Put(tab_id, std::move(thumbnail));

NotifyObserversOfThumbnailRead(tab_id);

}