content/browser/compositor/software_output_device_x11.cc - Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.

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/browser/compositor/software_output_device_x11.cc

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.

Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 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:

Index: content/browser/compositor/software_output_device_x11.cc

diff --git a/content/browser/compositor/software_output_device_x11.cc b/content/browser/compositor/software_output_device_x11.cc

index d2e6606166f84cd7be982a5384da8c42ed23642e..80686821ed58e624f64359e9081d3d6750089ac1 100644

--- a/content/browser/compositor/software_output_device_x11.cc

+++ b/content/browser/compositor/software_output_device_x11.cc

@@ -10,6 +10,8 @@

#include <X11/Xlib.h>

#include <X11/Xutil.h>

+#undef None // Defined by X11/X.h to 0L which collides with other headers

#include "content/public/browser/browser_thread.h"

#include "third_party/skia/include/core/SkImageInfo.h"

#include "ui/base/x/x11_util.h"