content/common/child_process_messages.h - Issue 1936093003: Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

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/common/child_process_messages.h

Issue 1936093003: Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename Status->ThreadStatus Created 4 years, 7 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_thread_impl.cc ('k') | media/gpu/ipc/service/gpu_video_decode_accelerator.cc » ('j') | media/gpu/ipc/service/gpu_video_decode_accelerator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/child_process_messages.h

diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h

index 3215a1dca6dc8f4ea905ef23d8839fc3e1d40d58..30b4e9add08aff14a9e28366ee20cb7026ff717d 100644

--- a/content/common/child_process_messages.h

+++ b/content/common/child_process_messages.h

@@ -31,7 +31,7 @@

IPC_ENUM_TRAITS_MAX_VALUE(content::CauseForGpuLaunch,

content::CAUSE_FOR_GPU_LAUNCH_MAX_ENUM - 1)

-IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::Status,

+IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::ThreadStatus,

tracked_objects::ThreadData::STATUS_LAST)

IPC_STRUCT_TRAITS_BEGIN(tracked_objects::LocationSnapshot)

@@ -89,7 +89,8 @@ IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetIPCLoggingEnabled,

// Tell the child process to enable or disable the profiler status.

IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetProfilerStatus,

- tracked_objects::ThreadData::Status /* profiler status */)

+ tracked_objects::ThreadData::ThreadStatus

+ /* profiler status */)

// Send to all the child processes to send back profiler data (ThreadData in

// tracked_objects).