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

Side by Side Diff: content/child/child_io_surface_manager_mac.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix base::ThreadRestrictions::AssertWaitAllowed crash 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 unified diff | Download patch
OLDNEW
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
89 MACH_LOG(ERROR, kr) << "mach_msg"; 89 MACH_LOG(ERROR, kr) << "mach_msg";
90 } 90 }
91 } 91 }
92 92
93 IOSurfaceRef ChildIOSurfaceManager::AcquireIOSurface( 93 IOSurfaceRef ChildIOSurfaceManager::AcquireIOSurface(
94 IOSurfaceId io_surface_id) { 94 IOSurfaceId io_surface_id) {
95 DCHECK(service_port_.is_valid()); 95 DCHECK(service_port_.is_valid());
96 96
97 // A valid token is required to acquire an IOSurface. This will wait for a 97 // A valid token is required to acquire an IOSurface. This will wait for a
98 // valid token if one has not yet been set. 98 // valid token if one has not yet been set.
99 set_token_event_.Wait(); 99 set_token_event_.Wait();
dshwang 2015/08/21 13:04:10 reveman, it should require "base::ThreadRestrictio
reveman 2015/08/21 14:40:31 Only if this is called on a thread where wait is n
dshwang 2015/08/21 15:21:18 Ah, compositor creates GMB in worker thread, not i
dshwang 2015/08/21 15:56:50 And crash happens in worker thread in chromeos. Fo
dshwang 2015/08/21 18:38:37 Added.
100 #if !defined(NDEBUG) 100 #if DCHECK_IS_ON()
101 DCHECK(!(set_token_thread_id_ == base::PlatformThread::CurrentRef())); 101 DCHECK(!(set_token_thread_id_ == base::PlatformThread::CurrentRef()));
102 #endif 102 #endif
103 DCHECK(!token_.IsZero()); 103 DCHECK(!token_.IsZero());
104 104
105 mach_port_t reply_port; 105 mach_port_t reply_port;
106 kern_return_t kr = mach_port_allocate(mach_task_self(), 106 kern_return_t kr = mach_port_allocate(mach_task_self(),
107 MACH_PORT_RIGHT_RECEIVE, &reply_port); 107 MACH_PORT_RIGHT_RECEIVE, &reply_port);
108 if (kr != KERN_SUCCESS) { 108 if (kr != KERN_SUCCESS) {
109 MACH_LOG(ERROR, kr) << "mach_port_allocate"; 109 MACH_LOG(ERROR, kr) << "mach_port_allocate";
110 return nullptr; 110 return nullptr;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 return IOSurfaceLookupFromMachPort(scoped_io_surface_right); 142 return IOSurfaceLookupFromMachPort(scoped_io_surface_right);
143 } 143 }
144 144
145 ChildIOSurfaceManager::ChildIOSurfaceManager() 145 ChildIOSurfaceManager::ChildIOSurfaceManager()
146 : set_token_event_(true, false) {} 146 : set_token_event_(true, false) {}
147 147
148 ChildIOSurfaceManager::~ChildIOSurfaceManager() { 148 ChildIOSurfaceManager::~ChildIOSurfaceManager() {
149 } 149 }
150 150
151 } // namespace content 151 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698