Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Side by Side Diff: cc/resources/resource_provider.cc

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « cc/resources/resource_pool.cc ('k') | cc/resources/resource_provider_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/resource_provider.h" 5 #include "cc/resources/resource_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/atomic_sequence_num.h" 10 #include "base/atomic_sequence_num.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 base::Bind(&SingleReleaseCallbackImpl::Run, 508 base::Bind(&SingleReleaseCallbackImpl::Run,
509 base::Owned(release_callback_impl.release())); 509 base::Owned(release_callback_impl.release()));
510 resource->read_lock_fences_enabled = read_lock_fences_enabled; 510 resource->read_lock_fences_enabled = read_lock_fences_enabled;
511 resource->is_overlay_candidate = mailbox.is_overlay_candidate(); 511 resource->is_overlay_candidate = mailbox.is_overlay_candidate();
512 return id; 512 return id;
513 } 513 }
514 514
515 ResourceId ResourceProvider::CreateResourceFromTextureMailbox( 515 ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
516 const TextureMailbox& mailbox, 516 const TextureMailbox& mailbox,
517 scoped_ptr<SingleReleaseCallbackImpl> release_callback_impl) { 517 scoped_ptr<SingleReleaseCallbackImpl> release_callback_impl) {
518 return CreateResourceFromTextureMailbox(mailbox, release_callback_impl.Pass(), 518 return CreateResourceFromTextureMailbox(
519 false); 519 mailbox, std::move(release_callback_impl), false);
520 } 520 }
521 521
522 void ResourceProvider::DeleteResource(ResourceId id) { 522 void ResourceProvider::DeleteResource(ResourceId id) {
523 DCHECK(thread_checker_.CalledOnValidThread()); 523 DCHECK(thread_checker_.CalledOnValidThread());
524 ResourceMap::iterator it = resources_.find(id); 524 ResourceMap::iterator it = resources_.find(id);
525 CHECK(it != resources_.end()); 525 CHECK(it != resources_.end());
526 Resource* resource = &it->second; 526 Resource* resource = &it->second;
527 DCHECK(!resource->marked_for_deletion); 527 DCHECK(!resource->marked_for_deletion);
528 DCHECK_EQ(resource->imported_count, 0); 528 DCHECK_EQ(resource->imported_count, 0);
529 DCHECK(!resource->locked_for_write); 529 DCHECK(!resource->locked_for_write);
(...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 const int kImportance = 2; 1661 const int kImportance = 2;
1662 pmd->CreateSharedGlobalAllocatorDump(guid); 1662 pmd->CreateSharedGlobalAllocatorDump(guid);
1663 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance); 1663 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
1664 } 1664 }
1665 } 1665 }
1666 1666
1667 return true; 1667 return true;
1668 } 1668 }
1669 1669
1670 } // namespace cc 1670 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/resource_pool.cc ('k') | cc/resources/resource_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698