diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 02:35:56 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 02:35:56 +0000 |
| commit | bd918adb442d90922182820d1b52851a404004e4 (patch) | |
| tree | 009b31c1db86f1b6b31b9359b97866cb06a8ca48 /skia | |
| parent | ab1773928ef4d27360a7e2dcb91d06f74d44d634 (diff) | |
| download | chromium_src-bd918adb442d90922182820d1b52851a404004e4.zip chromium_src-bd918adb442d90922182820d1b52851a404004e4.tar.gz chromium_src-bd918adb442d90922182820d1b52851a404004e4.tar.bz2 | |
Disable VectorCanvasTest.* on Aura since they crash.
BUG=154358
Review URL: https://codereview.chromium.org/11026077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/platform_canvas_unittest.cc | 8 | ||||
| -rw-r--r-- | skia/ext/vector_canvas_unittest.cc | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc index 125eb20..5679721 100644 --- a/skia/ext/platform_canvas_unittest.cc +++ b/skia/ext/platform_canvas_unittest.cc @@ -206,6 +206,8 @@ TEST(PlatformCanvas, SkLayer) { EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH)); } +#if !defined(USE_AURA) // http://crbug.com/154358 + // Test native clipping. TEST(PlatformCanvas, ClipRegion) { // Initialize a white canvas @@ -231,6 +233,8 @@ TEST(PlatformCanvas, ClipRegion) { EXPECT_TRUE(VerifyCanvasColor(canvas, SK_ColorWHITE)); } +#endif // !defined(USE_AURA) + // Test the layers get filled properly by native rendering. TEST(PlatformCanvas, FillLayer) { // Create the canvas initialized to opaque white. @@ -288,6 +292,8 @@ TEST(PlatformCanvas, FillLayer) { EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH)); } +#if !defined(USE_AURA) // http://crbug.com/154358 + // Test that translation + make layer works properly. TEST(PlatformCanvas, TranslateLayer) { // Create the canvas initialized to opaque white. @@ -387,4 +393,6 @@ TEST(PlatformCanvas, TranslateLayer) { #endif } +#endif // #if !defined(USE_AURA) + } // namespace skia diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index 8a84c19..d5f7f41 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/skia/ext/vector_canvas_unittest.cc @@ -448,6 +448,8 @@ class VectorCanvasTest : public ImageTest { //////////////////////////////////////////////////////////////////////////////// // Actual tests +#if !defined(USE_AURA) // http://crbug.com/154358 + TEST_F(VectorCanvasTest, BasicDrawing) { EXPECT_EQ(Image(*vcanvas_).PercentageDifferent(Image(*pcanvas_)), 0.) << L"clean"; @@ -961,4 +963,6 @@ TEST_F(VectorCanvasTest, DISABLED_Matrix) { } } +#endif // !defined(USE_AURA) + } // namespace skia |