| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "webkit/tools/test_shell/image_decoder_unittest.h" | 7 #include "webkit/tools/test_shell/image_decoder_unittest.h" |
| 8 | 8 |
| 9 #if !defined(OS_WIN) | 9 #if !defined(OS_WIN) |
| 10 #include <unistd.h> | 10 #include <unistd.h> |
| (...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 902 pcanvas_->clipRegion(old_region, SkRegion::kReplace_Op); | 902 pcanvas_->clipRegion(old_region, SkRegion::kReplace_Op); |
| 903 } | 903 } |
| 904 { | 904 { |
| 905 // Verify that the clipping region has been fixed back. | 905 // Verify that the clipping region has been fixed back. |
| 906 vcanvas_->drawBitmap(bitmap, 55, 3, NULL); | 906 vcanvas_->drawBitmap(bitmap, 55, 3, NULL); |
| 907 pcanvas_->drawBitmap(bitmap, 55, 3, NULL); | 907 pcanvas_->drawBitmap(bitmap, 55, 3, NULL); |
| 908 EXPECT_EQ(0., ProcessImage(L"unclipped")); | 908 EXPECT_EQ(0., ProcessImage(L"unclipped")); |
| 909 } | 909 } |
| 910 } | 910 } |
| 911 | 911 |
| 912 TEST_F(VectorCanvasTest, Matrix) { | 912 TEST_F(VectorCanvasTest, DISABLED_Matrix) { |
| 913 SkBitmap bitmap; | 913 SkBitmap bitmap; |
| 914 LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap); | 914 LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap); |
| 915 { | 915 { |
| 916 vcanvas_->translate(15, 3); | 916 vcanvas_->translate(15, 3); |
| 917 pcanvas_->translate(15, 3); | 917 pcanvas_->translate(15, 3); |
| 918 vcanvas_->drawBitmap(bitmap, 0, 0, NULL); | 918 vcanvas_->drawBitmap(bitmap, 0, 0, NULL); |
| 919 pcanvas_->drawBitmap(bitmap, 0, 0, NULL); | 919 pcanvas_->drawBitmap(bitmap, 0, 0, NULL); |
| 920 EXPECT_EQ(0., ProcessImage(L"translate1")); | 920 EXPECT_EQ(0., ProcessImage(L"translate1")); |
| 921 } | 921 } |
| 922 { | 922 { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 947 { | 947 { |
| 948 vcanvas_->rotate(67); | 948 vcanvas_->rotate(67); |
| 949 pcanvas_->rotate(67); | 949 pcanvas_->rotate(67); |
| 950 vcanvas_->drawBitmap(bitmap, 20, -50, NULL); | 950 vcanvas_->drawBitmap(bitmap, 20, -50, NULL); |
| 951 pcanvas_->drawBitmap(bitmap, 20, -50, NULL); | 951 pcanvas_->drawBitmap(bitmap, 20, -50, NULL); |
| 952 EXPECT_EQ(0., ProcessImage(L"rotate")); | 952 EXPECT_EQ(0., ProcessImage(L"rotate")); |
| 953 } | 953 } |
| 954 } | 954 } |
| 955 | 955 |
| 956 } // namespace skia | 956 } // namespace skia |
| OLD | NEW |