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 #if !defined(OS_WIN) | 7 #if !defined(OS_WIN) |
8 #include <unistd.h> | 8 #include <unistd.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
917 pcanvas_->clipRegion(old_region, SkRegion::kReplace_Op); | 917 pcanvas_->clipRegion(old_region, SkRegion::kReplace_Op); |
918 } | 918 } |
919 { | 919 { |
920 // Verify that the clipping region has been fixed back. | 920 // Verify that the clipping region has been fixed back. |
921 vcanvas_->drawBitmap(bitmap, 55, 3, NULL); | 921 vcanvas_->drawBitmap(bitmap, 55, 3, NULL); |
922 pcanvas_->drawBitmap(bitmap, 55, 3, NULL); | 922 pcanvas_->drawBitmap(bitmap, 55, 3, NULL); |
923 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("unclipped"))); | 923 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("unclipped"))); |
924 } | 924 } |
925 } | 925 } |
926 | 926 |
927 TEST_F(VectorCanvasTest, FAILS_Matrix) { | 927 // See http://crbug.com/26938 |
| 928 TEST_F(VectorCanvasTest, DISABLED_Matrix) { |
928 SkBitmap bitmap; | 929 SkBitmap bitmap; |
929 LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap, | 930 LoadPngFileToSkBitmap(test_file(L"..\\bitmaps\\bitmap_opaque.png"), &bitmap, |
930 true); | 931 true); |
931 { | 932 { |
932 vcanvas_->translate(15, 3); | 933 vcanvas_->translate(15, 3); |
933 pcanvas_->translate(15, 3); | 934 pcanvas_->translate(15, 3); |
934 vcanvas_->drawBitmap(bitmap, 0, 0, NULL); | 935 vcanvas_->drawBitmap(bitmap, 0, 0, NULL); |
935 pcanvas_->drawBitmap(bitmap, 0, 0, NULL); | 936 pcanvas_->drawBitmap(bitmap, 0, 0, NULL); |
936 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("translate1"))); | 937 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("translate1"))); |
937 } | 938 } |
(...skipping 25 matching lines...) Expand all Loading... |
963 { | 964 { |
964 vcanvas_->rotate(67); | 965 vcanvas_->rotate(67); |
965 pcanvas_->rotate(67); | 966 pcanvas_->rotate(67); |
966 vcanvas_->drawBitmap(bitmap, 20, -50, NULL); | 967 vcanvas_->drawBitmap(bitmap, 20, -50, NULL); |
967 pcanvas_->drawBitmap(bitmap, 20, -50, NULL); | 968 pcanvas_->drawBitmap(bitmap, 20, -50, NULL); |
968 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate"))); | 969 EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate"))); |
969 } | 970 } |
970 } | 971 } |
971 | 972 |
972 } // namespace skia | 973 } // namespace skia |
OLD | NEW |