Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Side by Side Diff: content/browser/compositor/software_output_device_x11.cc

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string.h>
9 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
10 #include <X11/Xutil.h> 11 #include <X11/Xutil.h>
11 12
12 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
13 #include "third_party/skia/include/core/SkImageInfo.h" 14 #include "third_party/skia/include/core/SkImageInfo.h"
14 #include "ui/base/x/x11_util.h" 15 #include "ui/base/x/x11_util.h"
15 #include "ui/base/x/x11_util_internal.h" 16 #include "ui/base/x/x11_util_internal.h"
16 #include "ui/compositor/compositor.h" 17 #include "ui/compositor/compositor.h"
17 #include "ui/gfx/x/x11_types.h" 18 #include "ui/gfx/x/x11_types.h"
18 19
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 size_t rowBytes; 120 size_t rowBytes;
120 const void* addr = surface_->peekPixels(&info, &rowBytes); 121 const void* addr = surface_->peekPixels(&info, &rowBytes);
121 gfx::PutARGBImage( 122 gfx::PutARGBImage(
122 display_, attributes_.visual, attributes_.depth, compositor_->widget(), 123 display_, attributes_.visual, attributes_.depth, compositor_->widget(),
123 gc_, static_cast<const uint8_t*>(addr), viewport_pixel_size_.width(), 124 gc_, static_cast<const uint8_t*>(addr), viewport_pixel_size_.width(),
124 viewport_pixel_size_.height(), rect.x(), rect.y(), rect.x(), rect.y(), 125 viewport_pixel_size_.height(), rect.x(), rect.y(), rect.x(), rect.y(),
125 rect.width(), rect.height()); 126 rect.width(), rect.height());
126 } 127 }
127 128
128 } // namespace content 129 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_thread_impl.cc ('k') | content/browser/device_sensors/data_fetcher_shared_memory_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698