media/gpu/ipc/service/gpu_video_decode_accelerator.cc - 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: media/gpu/ipc/service/gpu_video_decode_accelerator.cc

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: Move misplaced #endif to preserve #undefs across platforms 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

Index: media/gpu/ipc/service/gpu_video_decode_accelerator.cc

diff --git a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc

index 6e6ba3155a91627f58e84cbba567dd7fac831dea..18a17de2725e456f53a3ba4c121cd2632c177619 100644

--- a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc

+++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc

@@ -2,15 +2,6 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-// TODO(markdittmer): This shouldn't be necessary.

-// Ensure that X11 headers don't poison environment before macro headers are

-// loaded.

-//

-// In particular, X11/Xlib.h defines "Status", which is the name of an enum

-// defined in "base/tracked_objects.h", which is eventually required by

-// "ipc/ipc_message_macros.h".

-#include "ipc/ipc_message_macros.h"

#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"

#include <memory>

@@ -28,6 +19,7 @@

#include "gpu/command_buffer/service/gpu_preferences.h"

#include "gpu/ipc/service/gpu_channel.h"

#include "gpu/ipc/service/gpu_channel_manager.h"

+#include "ipc/ipc_message_macros.h"

#include "ipc/ipc_message_utils.h"

#include "ipc/message_filter.h"

#include "media/base/limits.h"

« no previous file with comments | « no previous file | ui/gl/gl_bindings.h » ('j') | no next file with comments »