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

content/browser/compositor/software_output_device_x11.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_
 
 #include <X11/Xlib.h>
 
+#undef None // Defined by X11/X.h to 0L which collides with other headers
+
 #include "base/macros.h"
 #include "cc/output/software_output_device.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 class Compositor;
 }
 
 namespace content {
 
@@ skipping 10 matching lines @@
   XDisplay* display_;
   GC gc_;
   XWindowAttributes attributes_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceX11);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_OUTPUT_DEVICE_X11_H_