Mac: Suppress asserts about resources being in use

cc/resources/resource_pool.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/resource_pool.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 84 matching lines @@
 }
 
 Resource* ResourcePool::AcquireResource(const gfx::Size& size,
                                         ResourceFormat format) {
   // Finding resources in |unused_resources_| from MRU to LRU direction, touches
   // LRU resources only if needed, which increases possibility of expiring more
   // LRU resources within kResourceExpirationDelayMs.
   for (ResourceDeque::iterator it = unused_resources_.begin();
        it != unused_resources_.end(); ++it) {
     ScopedResource* resource = it->get();
-    // TODO(ccameron): Investigate why this fails (http://crbug.com/577121).
-    // DCHECK(resource_provider_->CanLockForWrite(resource->id()));
+    // 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()));
 
     if (resource->format() != format)
       continue;
     if (resource->size() != size)
       continue;
 
     // Transfer resource to |in_use_resources_|.
     in_use_resources_[resource->id()] = std::move(*it);
     unused_resources_.erase(it);
     in_use_memory_usage_bytes_ += ResourceUtil::UncheckedSizeInBytes<size_t>(
@@ skipping 29 matching lines @@
 
   auto it =
       std::find_if(unused_resources_.begin(), unused_resources_.end(),
                    [content_id](const scoped_ptr<PoolResource>& pool_resource) {
                      return pool_resource->content_id() == content_id;
                    });
   if (it == unused_resources_.end())
     return nullptr;
 
   Resource* resource = it->get();
-  DCHECK(resource_provider_->CanLockForWrite(resource->id()));
+  // 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()));
 
   // Transfer resource to |in_use_resources_|.
   in_use_resources_[resource->id()] = std::move(*it);
   unused_resources_.erase(it);
   in_use_memory_usage_bytes_ += ResourceUtil::UncheckedSizeInBytes<size_t>(
       resource->size(), resource->format());
   return resource;
 }
 
 void ResourcePool::ReleaseResource(Resource* resource, uint64_t content_id) {
@@ skipping 148 matching lines @@
   for (const auto& resource : busy_resources_) {
     resource->OnMemoryDump(pmd, resource_provider_, false /* is_free */);
   }
   for (const auto& entry : in_use_resources_) {
     entry.second->OnMemoryDump(pmd, resource_provider_, false /* is_free */);
   }
   return true;
 }
 
 }  // namespace cc