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

Side by Side Diff: ui/gfx/image/image_unittest_util.cc

Issue 1543183002: Switch to standard integer types in ui/gfx/. (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
« no previous file with comments | « ui/gfx/image/image_unittest_util.h ('k') | ui/gfx/image/image_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Because the unit tests for gfx::Image are spread across multiple 5 // Because the unit tests for gfx::Image are spread across multiple
6 // implementation files, this header contains the reusable components. 6 // implementation files, this header contains the reusable components.
7 7
8 #include "ui/gfx/image/image_unittest_util.h" 8 #include "ui/gfx/image/image_unittest_util.h"
9 9
10 #include <stddef.h>
11
10 #include <cmath> 12 #include <cmath>
11 13
12 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "build/build_config.h"
13 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/skia/include/core/SkBitmap.h" 17 #include "third_party/skia/include/core/SkBitmap.h"
15 #include "ui/gfx/codec/png_codec.h" 18 #include "ui/gfx/codec/png_codec.h"
16 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
17 20
18 #if defined(OS_IOS) 21 #if defined(OS_IOS)
19 #include "base/mac/foundation_util.h" 22 #include "base/mac/foundation_util.h"
20 #include "base/mac/scoped_cftyperef.h" 23 #include "base/mac/scoped_cftyperef.h"
21 #include "skia/ext/skia_utils_ios.h" 24 #include "skia/ext/skia_utils_ios.h"
22 #elif defined(OS_MACOSX) 25 #elif defined(OS_MACOSX)
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) { 290 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
288 #if defined(OS_MACOSX) 291 #if defined(OS_MACOSX)
289 return image1 == image2; 292 return image1 == image2;
290 #else 293 #else
291 return image1.BackedBySameObjectAs(image2); 294 return image1.BackedBySameObjectAs(image2);
292 #endif 295 #endif
293 } 296 }
294 297
295 } // namespace test 298 } // namespace test
296 } // namespace gfx 299 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/image/image_unittest_util.h ('k') | ui/gfx/image/image_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698