| 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 #include "testing/gtest/include/gtest/gtest.h" | 5 #include "testing/gtest/include/gtest/gtest.h" |
| 6 #include "third_party/skia/include/core/SkCanvas.h" | 6 #include "third_party/skia/include/core/SkCanvas.h" |
| 7 #include "third_party/skia/include/core/SkPaint.h" | 7 #include "third_party/skia/include/core/SkPaint.h" |
| 8 #include "ui/gfx/image/image.h" | 8 #include "ui/gfx/image/image.h" |
| 9 #include "ui/gfx/image/image_png_rep.h" | 9 #include "ui/gfx/image/image_png_rep.h" |
| 10 #include "ui/gfx/image/image_skia.h" | 10 #include "ui/gfx/image/image_skia.h" |
| (...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 669 { | 669 { |
| 670 SkBitmap bitmap(gt::CreateBitmap(10, 10)); | 670 SkBitmap bitmap(gt::CreateBitmap(10, 10)); |
| 671 EXPECT_TRUE(!bitmap.isNull()); | 671 EXPECT_TRUE(!bitmap.isNull()); |
| 672 image = gfx::Image(gfx::ImageSkia( | 672 image = gfx::Image(gfx::ImageSkia( |
| 673 gfx::ImageSkiaRep(bitmap, 1.0f))); | 673 gfx::ImageSkiaRep(bitmap, 1.0f))); |
| 674 } | 674 } |
| 675 EXPECT_TRUE(!image.ToSkBitmap()->isNull()); | 675 EXPECT_TRUE(!image.ToSkBitmap()->isNull()); |
| 676 } | 676 } |
| 677 | 677 |
| 678 // Integration tests with UI toolkit frameworks require linking against the | 678 // Integration tests with UI toolkit frameworks require linking against the |
| 679 // Views library and cannot be here (ui_unittests doesn't include it). They | 679 // Views library and cannot be here (ui_base_unittests doesn't include it). They |
| 680 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc. | 680 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc. |
| 681 | 681 |
| 682 } // namespace | 682 } // namespace |
| OLD | NEW |