cc/layers/layer_impl.cc - Issue 534743002: ScopedPtrVector change back const_iterator typedef

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: cc/layers/layer_impl.cc

Issue 534743002: ScopedPtrVector change back const_iterator typedef (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 months ago

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

Jump to:

Index: cc/layers/layer_impl.cc

diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc

index 2d444a1545717e2fab6c6dc257a41f26fd8300dc..1af7727bbc02cd8287440d3fb2c581c4b6560ec8 100644

--- a/cc/layers/layer_impl.cc

+++ b/cc/layers/layer_impl.cc

@@ -206,7 +206,7 @@ void LayerImpl::PassCopyRequests(ScopedPtrVector<CopyOutputRequest>* requests) {

return;

bool was_empty = copy_requests_.empty();

- copy_requests_.insert_and_take(copy_requests_.end(), *requests);

+ copy_requests_.insert_and_take(copy_requests_.end(), requests);

requests->clear();

if (was_empty && layer_tree_impl()->IsActiveTree())

@@ -220,7 +220,7 @@ void LayerImpl::TakeCopyRequestsAndTransformToTarget(

DCHECK(layer_tree_impl()->IsActiveTree());

size_t first_inserted_request = requests->size();

- requests->insert_and_take(requests->end(), copy_requests_);

+ requests->insert_and_take(requests->end(), &copy_requests_);

copy_requests_.clear();

for (size_t i = first_inserted_request; i < requests->size(); ++i) {

« no previous file with comments | « cc/base/scoped_ptr_vector_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »