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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/child/child_io_surface_manager_mac.h

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/browser/renderer_host/render_process_host_impl.cc ('k') | content/child/child_io_surface_manager_mac.cc » ('j') | content/child/child_io_surface_manager_mac.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/child_io_surface_manager_mac.h

diff --git a/content/child/child_io_surface_manager_mac.h b/content/child/child_io_surface_manager_mac.h

index fea9214a69a7f202d0c83ff7fd87901558a11558..6be793554e71c3074cd609ce9d42397d4cc2bf7c 100644

--- a/content/child/child_io_surface_manager_mac.h

+++ b/content/child/child_io_surface_manager_mac.h

@@ -38,7 +38,7 @@ class CONTENT_EXPORT ChildIOSurfaceManager : public IOSurfaceManager {

// Set the token used when communicating with the Mach service.

void set_token(const IOSurfaceManagerToken& token) {

token_ = token;

-#if !defined(NDEBUG)

+#if DCHECK_IS_ON()

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

#endif

set_token_event_.Signal();

@@ -52,7 +52,7 @@ class CONTENT_EXPORT ChildIOSurfaceManager : public IOSurfaceManager {

base::mac::ScopedMachSendRight service_port_;

IOSurfaceManagerToken token_;

-#if !defined(NDEBUG)

+#if DCHECK_IS_ON()

base::PlatformThreadRef set_token_thread_id_;

#endif

base::WaitableEvent set_token_event_;