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

ui/base/x/x11_util_internal.h

 // Copyright (c) 2011 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 UI_BASE_X_X11_UTIL_INTERNAL_H_
 #define UI_BASE_X_X11_UTIL_INTERNAL_H_
 
 // This file declares utility functions for X11 (Linux only).
 //
 // These functions require the inclusion of the Xlib headers. Since the Xlib
 // headers pollute so much of the namespace, this should only be included
 // when needed.
 
 extern "C" {
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/XShm.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
+#define Bool int  // Ironic, but other headers undef Bool
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XShm.h>
+#include <X11/extensions/Xrender.h>
+#undef None    // Defined by X11/X.h to 0L which collides with other headers
+#undef Status  // Defined by X11/Xlib.h to int which collides with other headers
+#undef True    // Defined by X11/Xlib.h to 1 which collides with other headers
+#undef False   // Defined by X11/Xlib.h to 0 which collides with other headers
+#undef CurrentTime  // Defined by X11/X.h to 0L which collides with other
+                    // headers
+#undef Success      // Defined by X11/X.h to 0 which collides with other headers
+#undef CREATE      // Defined by XInput.h to 1 which collides with other headers
+#undef DestroyAll  // Defined by X11/X.h to 0 which collides with other headers
+#undef COUNT       // Defined by X11/extensions/XI.h to 0 which collides
 }
 
+struct X11Constants {
+  static const long None = 0L;
+  static const long CurrentTime = 0L;
+  static const int False = 0;
+  static const int True = 1;
+  static const int Success = 0;
+  typedef int Status;
+};
+
 #include <memory>
 #include <unordered_map>
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/base/x/ui_base_x_export.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace base {
 template <typename T>
@@ skipping 84 matching lines @@
   bool using_compositing_wm_;
   bool using_software_rendering_;
   bool have_gpu_argb_visual_;
 
   DISALLOW_COPY_AND_ASSIGN(XVisualManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_X11_UTIL_INTERNAL_H_