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

content/browser/compositor/software_output_device_x11.cc

 // 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.
 
 #include "content/browser/compositor/software_output_device_x11.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #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"
 #include "ui/base/x/x11_util_internal.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace content {
 
 SoftwareOutputDeviceX11::SoftwareOutputDeviceX11(ui::Compositor* compositor)
@@ skipping 96 matching lines @@
   SkPixmap pixmap;
   surface_->peekPixels(&pixmap);
   gfx::PutARGBImage(
       display_, attributes_.visual, attributes_.depth, compositor_->widget(),
       gc_, static_cast<const uint8_t*>(pixmap.addr()),
       viewport_pixel_size_.width(), viewport_pixel_size_.height(), rect.x(),
       rect.y(), rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 }  // namespace content