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

Unified Diff: cc/resources/resource_pool.cc

Issue 2000323004: cc: Remove InUseByMacOSWindowServer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@video2
Patch Set: Created 4 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/resources/resource_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_pool.cc
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc
index 38ec99d227ece7b4d3368cf019db98f1667341a5..0ec24005a49e8e40af31fc771f559a69fbd83845 100644
--- a/cc/resources/resource_pool.cc
+++ b/cc/resources/resource_pool.cc
@@ -102,11 +102,7 @@ Resource* ResourcePool::AcquireResource(const gfx::Size& size,
for (ResourceDeque::iterator it = unused_resources_.begin();
it != unused_resources_.end(); ++it) {
ScopedResource* resource = it->get();
- // TODO(ccameron): The allowance for IsInUseByMacOSWindowServer should not
- // be needed.
- // http://crbug.com/577121
- DCHECK(resource_provider_->CanLockForWrite(resource->id()) ||
- resource_provider_->IsInUseByMacOSWindowServer(resource->id()));
+ DCHECK(resource_provider_->CanLockForWrite(resource->id()));
if (resource->format() != format)
continue;
@@ -156,11 +152,7 @@ Resource* ResourcePool::TryAcquireResourceWithContentId(uint64_t content_id) {
return nullptr;
Resource* resource = it->get();
- // TODO(ccameron): The allowance for IsInUseByMacOSWindowServer should not
- // be needed.
- // http://crbug.com/577121
- DCHECK(resource_provider_->CanLockForWrite(resource->id()) ||
- resource_provider_->IsInUseByMacOSWindowServer(resource->id()));
+ DCHECK(resource_provider_->CanLockForWrite(resource->id()));
// Transfer resource to |in_use_resources_|.
in_use_resources_[resource->id()] = std::move(*it);
« no previous file with comments | « no previous file | cc/resources/resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698