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

Unified Diff: cc/resources/resource_provider.cc

Issue 1688953002: Mac: Suppress asserts about resources being in use (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missed function Created 4 years, 10 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 | « cc/resources/resource_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 54411aa1853e3ffbec18d1ce93cb664b444e2d0d..898bc81c102abbcb1b73fd72e1ab06a2b3350a42 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -787,8 +787,10 @@ void ResourceProvider::UnlockForRead(ResourceId id) {
ResourceProvider::Resource* ResourceProvider::LockForWrite(ResourceId id) {
Resource* resource = GetResource(id);
- DCHECK(CanLockForWrite(id));
-
+ // TODO(ccameron): The allowance for IsInUseByMacOSWindowServer should not
+ // be needed.
+ // http://crbug.com/577121
+ DCHECK(CanLockForWrite(id) || IsInUseByMacOSWindowServer(id));
resource->locked_for_write = true;
return resource;
}
@@ -807,6 +809,12 @@ bool ResourceProvider::IsOverlayCandidate(ResourceId id) {
return resource->is_overlay_candidate;
}
+bool ResourceProvider::IsInUseByMacOSWindowServer(ResourceId id) {
+ Resource* resource = GetResource(id);
+ return resource->gpu_memory_buffer &&
+ resource->gpu_memory_buffer->IsInUseByMacOSWindowServer();
+}
+
void ResourceProvider::UnlockForWrite(ResourceProvider::Resource* resource) {
DCHECK(resource->locked_for_write);
DCHECK_EQ(resource->exported_count, 0);
« no previous file with comments | « cc/resources/resource_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698