| OLD | NEW |
|---|
| 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 #ifndef UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_ | 8 #ifndef UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_ |
| 9 #define UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_ | 9 #define UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_ |
| 10 | 10 |
| 11 #include "build/build_config.h" |
| 12 #include "third_party/skia/include/core/SkColor.h" |
| 11 #include "ui/gfx/image/image.h" | 13 #include "ui/gfx/image/image.h" |
| 12 #include "third_party/skia/include/core/SkColor.h" | |
| 13 | 14 |
| 14 namespace gfx { | 15 namespace gfx { |
| 15 namespace test { | 16 namespace test { |
| 16 | 17 |
| 17 #if defined(OS_IOS) | 18 #if defined(OS_IOS) |
| 18 typedef UIImage* PlatformImage; | 19 typedef UIImage* PlatformImage; |
| 19 #elif defined(OS_MACOSX) | 20 #elif defined(OS_MACOSX) |
| 20 typedef NSImage* PlatformImage; | 21 typedef NSImage* PlatformImage; |
| 21 #else | 22 #else |
| 22 typedef gfx::ImageSkia PlatformImage; | 23 typedef gfx::ImageSkia PlatformImage; |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 void CheckIsTransparent(SkColor color); | 101 void CheckIsTransparent(SkColor color); |
| 101 | 102 |
| 102 bool IsPlatformImageValid(PlatformImage image); | 103 bool IsPlatformImageValid(PlatformImage image); |
| 103 | 104 |
| 104 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2); | 105 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2); |
| 105 | 106 |
| 106 } // namespace test | 107 } // namespace test |
| 107 } // namespace gfx | 108 } // namespace gfx |
| 108 | 109 |
| 109 #endif // UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_ | 110 #endif // UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1543183002:
Switch to standard integer types in ui/gfx/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master