| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "content/browser/compositor/software_output_device_x11.h" | 5 #include "content/browser/compositor/software_output_device_x11.h" | 
| 6 | 6 | 
| 7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> | 
| 8 #include <X11/Xutil.h> | 8 #include <X11/Xutil.h> | 
| 9 | 9 | 
| 10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" | 
| 11 #include "third_party/skia/include/core/SkBitmap.h" | 11 #include "third_party/skia/include/core/SkImageInfo.h" | 
| 12 #include "third_party/skia/include/core/SkDevice.h" |  | 
| 13 #include "ui/base/x/x11_util.h" | 12 #include "ui/base/x/x11_util.h" | 
| 14 #include "ui/base/x/x11_util_internal.h" | 13 #include "ui/base/x/x11_util_internal.h" | 
| 15 #include "ui/compositor/compositor.h" | 14 #include "ui/compositor/compositor.h" | 
| 16 #include "ui/gfx/x/x11_types.h" | 15 #include "ui/gfx/x/x11_types.h" | 
| 17 | 16 | 
| 18 namespace content { | 17 namespace content { | 
| 19 | 18 | 
| 20 SoftwareOutputDeviceX11::SoftwareOutputDeviceX11(ui::Compositor* compositor) | 19 SoftwareOutputDeviceX11::SoftwareOutputDeviceX11(ui::Compositor* compositor) | 
| 21     : compositor_(compositor), display_(gfx::GetXDisplay()), gc_(NULL) { | 20     : compositor_(compositor), display_(gfx::GetXDisplay()), gc_(NULL) { | 
| 22   // TODO(skaslev) Remove this when crbug.com/180702 is fixed. | 21   // TODO(skaslev) Remove this when crbug.com/180702 is fixed. | 
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 127                     viewport_pixel_size_.height(), | 126                     viewport_pixel_size_.height(), | 
| 128                     rect.x(), | 127                     rect.x(), | 
| 129                     rect.y(), | 128                     rect.y(), | 
| 130                     rect.x(), | 129                     rect.x(), | 
| 131                     rect.y(), | 130                     rect.y(), | 
| 132                     rect.width(), | 131                     rect.width(), | 
| 133                     rect.height()); | 132                     rect.height()); | 
| 134 } | 133 } | 
| 135 | 134 | 
| 136 }  // namespace content | 135 }  // namespace content | 
| OLD | NEW | 
|---|