OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/child/child_io_surface_manager_mac.h" | 5 #include "content/child/child_io_surface_manager_mac.h" |
6 | 6 |
7 #include "base/mac/mach_logging.h" | 7 #include "base/mac/mach_logging.h" |
8 #include "content/common/mac/io_surface_manager_messages.h" | 8 #include "content/common/mac/io_surface_manager_messages.h" |
9 | 9 |
10 namespace content { | 10 namespace content { |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 MACH_LOG(ERROR, kr) << "mach_msg"; | 89 MACH_LOG(ERROR, kr) << "mach_msg"; |
90 } | 90 } |
91 } | 91 } |
92 | 92 |
93 IOSurfaceRef ChildIOSurfaceManager::AcquireIOSurface(int io_surface_id) { | 93 IOSurfaceRef ChildIOSurfaceManager::AcquireIOSurface(int io_surface_id) { |
94 DCHECK(service_port_.is_valid()); | 94 DCHECK(service_port_.is_valid()); |
95 | 95 |
96 // A valid token is required to acquire an IOSurface. This will wait for a | 96 // A valid token is required to acquire an IOSurface. This will wait for a |
97 // valid token if one has not yet been set. | 97 // valid token if one has not yet been set. |
98 set_token_event_.Wait(); | 98 set_token_event_.Wait(); |
99 #if !defined(NDEBUG) | 99 DCHECK(!set_token_thread_checker_->CalledOnValidThread()); |
reveman
2015/08/18 14:34:27
this is not the same. you can't use a thread check
dshwang
2015/08/18 14:45:50
How it's different. The implementation is same; ht
reveman
2015/08/18 15:02:38
if ENABLE_THREAD_CHECKER is false then this is the
dshwang
2015/08/18 15:41:44
ENABLE_THREAD_CHECKER is true if (!defined(NDEBUG)
| |
100 DCHECK(!(set_token_thread_id_ == base::PlatformThread::CurrentRef())); | |
101 #endif | |
102 DCHECK(!token_.IsZero()); | 100 DCHECK(!token_.IsZero()); |
103 | 101 |
104 mach_port_t reply_port; | 102 mach_port_t reply_port; |
105 kern_return_t kr = mach_port_allocate(mach_task_self(), | 103 kern_return_t kr = mach_port_allocate(mach_task_self(), |
106 MACH_PORT_RIGHT_RECEIVE, &reply_port); | 104 MACH_PORT_RIGHT_RECEIVE, &reply_port); |
107 if (kr != KERN_SUCCESS) { | 105 if (kr != KERN_SUCCESS) { |
108 MACH_LOG(ERROR, kr) << "mach_port_allocate"; | 106 MACH_LOG(ERROR, kr) << "mach_port_allocate"; |
109 return nullptr; | 107 return nullptr; |
110 } | 108 } |
111 base::mac::ScopedMachReceiveRight scoped_receive_right(reply_port); | 109 base::mac::ScopedMachReceiveRight scoped_receive_right(reply_port); |
(...skipping 29 matching lines...) Expand all Loading... | |
141 return IOSurfaceLookupFromMachPort(scoped_io_surface_right); | 139 return IOSurfaceLookupFromMachPort(scoped_io_surface_right); |
142 } | 140 } |
143 | 141 |
144 ChildIOSurfaceManager::ChildIOSurfaceManager() | 142 ChildIOSurfaceManager::ChildIOSurfaceManager() |
145 : set_token_event_(true, false) {} | 143 : set_token_event_(true, false) {} |
146 | 144 |
147 ChildIOSurfaceManager::~ChildIOSurfaceManager() { | 145 ChildIOSurfaceManager::~ChildIOSurfaceManager() { |
148 } | 146 } |
149 | 147 |
150 } // namespace content | 148 } // namespace content |
OLD | NEW |