content/child/child_io_surface_manager_mac.cc - Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer.

Unified 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 side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/render_process_host_impl.cc ('K') | « content/child/child_io_surface_manager_mac.h ('k') | content/child/child_thread_impl.cc » ('j') | ui/ozone/platform/drm/common/client_native_pixmap_factory_gbm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..13f899e04ff9672698a100bb5c077dc585ded23e 100644

--- a/content/child/child_io_surface_manager_mac.cc

+++ b/content/child/child_io_surface_manager_mac.cc

@@ -97,7 +97,7 @@ IOSurfaceRef ChildIOSurfaceManager::AcquireIOSurface(

// 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();

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.

-#if !defined(NDEBUG)

+#if DCHECK_IS_ON()

DCHECK(!(set_token_thread_id_ == base::PlatformThread::CurrentRef()));

#endif

DCHECK(!token_.IsZero());