| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #if !defined(OS_WIN) | 7 #if !defined(OS_WIN) |
| 8 #include <unistd.h> | 8 #include <unistd.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 | 443 |
| 444 // When true (default), vcanvas_ and pcanvas_ contents are compared and | 444 // When true (default), vcanvas_ and pcanvas_ contents are compared and |
| 445 // verified to be identical. | 445 // verified to be identical. |
| 446 bool compare_canvas_; | 446 bool compare_canvas_; |
| 447 }; | 447 }; |
| 448 | 448 |
| 449 | 449 |
| 450 //////////////////////////////////////////////////////////////////////////////// | 450 //////////////////////////////////////////////////////////////////////////////// |
| 451 // Actual tests | 451 // Actual tests |
| 452 | 452 |
| 453 #if !defined(USE_AURA) // http://crbug.com/154358 | |
| 454 | |
| 455 TEST_F(VectorCanvasTest, BasicDrawing) { | 453 TEST_F(VectorCanvasTest, BasicDrawing) { |
| 456 EXPECT_EQ(Image(*vcanvas_).PercentageDifferent(Image(*pcanvas_)), 0.) | 454 EXPECT_EQ(Image(*vcanvas_).PercentageDifferent(Image(*pcanvas_)), 0.) |
| 457 << L"clean"; | 455 << L"clean"; |
| 458 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("clean"))); | 456 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("clean"))); |
| 459 | 457 |
| 460 // Clear white. | 458 // Clear white. |
| 461 { | 459 { |
| 462 vcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode); | 460 vcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode); |
| 463 pcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode); | 461 pcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode); |
| 464 } | 462 } |
| (...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 958 | 956 |
| 959 { | 957 { |
| 960 vcanvas_->rotate(67); | 958 vcanvas_->rotate(67); |
| 961 pcanvas_->rotate(67); | 959 pcanvas_->rotate(67); |
| 962 vcanvas_->drawBitmap(bitmap, 20, -50, NULL); | 960 vcanvas_->drawBitmap(bitmap, 20, -50, NULL); |
| 963 pcanvas_->drawBitmap(bitmap, 20, -50, NULL); | 961 pcanvas_->drawBitmap(bitmap, 20, -50, NULL); |
| 964 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate"))); | 962 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate"))); |
| 965 } | 963 } |
| 966 } | 964 } |
| 967 | 965 |
| 968 #endif // !defined(USE_AURA) | |
| 969 | |
| 970 } // namespace skia | 966 } // namespace skia |
| OLD | NEW |