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

Unified Diff: content/child/child_io_surface_manager_mac.cc

Issue 1312353002: content: Remove base::WaitableEvent from ChildIOSurfaceManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add comments Created 5 years, 4 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 | « content/child/child_io_surface_manager_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/child_io_surface_manager_mac.cc
diff --git a/content/child/child_io_surface_manager_mac.cc b/content/child/child_io_surface_manager_mac.cc
index 65df72b04aa034053d80a292362a0c234f574884..71980b77bbd2e721d32946a5ea05a38510de0610 100644
--- a/content/child/child_io_surface_manager_mac.cc
+++ b/content/child/child_io_surface_manager_mac.cc
@@ -93,13 +93,6 @@ void ChildIOSurfaceManager::UnregisterIOSurface(IOSurfaceId io_surface_id,
IOSurfaceRef ChildIOSurfaceManager::AcquireIOSurface(
IOSurfaceId io_surface_id) {
DCHECK(service_port_.is_valid());
-
- // A valid token is required to acquire an IOSurface. This will wait for a
- // valid token if one has not yet been set.
- set_token_event_.Wait();
-#if !defined(NDEBUG)
- DCHECK(!(set_token_thread_id_ == base::PlatformThread::CurrentRef()));
-#endif
DCHECK(!token_.IsZero());
mach_port_t reply_port;
@@ -142,10 +135,8 @@ IOSurfaceRef ChildIOSurfaceManager::AcquireIOSurface(
return IOSurfaceLookupFromMachPort(scoped_io_surface_right);
}
-ChildIOSurfaceManager::ChildIOSurfaceManager()
- : set_token_event_(true, false) {}
+ChildIOSurfaceManager::ChildIOSurfaceManager() {}
-ChildIOSurfaceManager::~ChildIOSurfaceManager() {
-}
+ChildIOSurfaceManager::~ChildIOSurfaceManager() {}
} // namespace content
« no previous file with comments | « content/child/child_io_surface_manager_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698