| 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);
|
|
|