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

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

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_mus.h" 5 #include "content/browser/compositor/software_output_device_mus.h"
6 6
7 #include <stddef.h>
8
7 #include "components/bitmap_uploader/bitmap_uploader.h" 9 #include "components/bitmap_uploader/bitmap_uploader.h"
8 #include "third_party/skia/include/core/SkImageInfo.h" 10 #include "third_party/skia/include/core/SkImageInfo.h"
9 #include "ui/base/view_prop.h" 11 #include "ui/base/view_prop.h"
10 #include "ui/compositor/compositor.h" 12 #include "ui/compositor/compositor.h"
11 #include "ui/gfx/skia_util.h" 13 #include "ui/gfx/skia_util.h"
12 14
13 #if !defined(OFFICIAL_BUILD) 15 #if !defined(OFFICIAL_BUILD)
14 #include "base/threading/thread_restrictions.h" 16 #include "base/threading/thread_restrictions.h"
15 #endif 17 #endif
16 18
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 // TODO(rjkroege): This makes an additional copy. Improve the 56 // TODO(rjkroege): This makes an additional copy. Improve the
55 // bitmap_uploader API to remove. 57 // bitmap_uploader API to remove.
56 scoped_ptr<std::vector<unsigned char>> data(new std::vector<unsigned char>( 58 scoped_ptr<std::vector<unsigned char>> data(new std::vector<unsigned char>(
57 pixels, pixels + rowBytes * viewport_pixel_size_.height())); 59 pixels, pixels + rowBytes * viewport_pixel_size_.height()));
58 uploader->SetBitmap(viewport_pixel_size_.width(), 60 uploader->SetBitmap(viewport_pixel_size_.width(),
59 viewport_pixel_size_.height(), data.Pass(), 61 viewport_pixel_size_.height(), data.Pass(),
60 bitmap_uploader::BitmapUploader::BGRA); 62 bitmap_uploader::BitmapUploader::BGRA);
61 } 63 }
62 64
63 } // namespace content 65 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/compositor/software_output_device_mac.mm ('k') | content/browser/compositor/software_output_device_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698