summaryrefslogtreecommitdiffstats
path: root/skia/ext/platform_canvas_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 02:35:56 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 02:35:56 +0000
commitbd918adb442d90922182820d1b52851a404004e4 (patch)
tree009b31c1db86f1b6b31b9359b97866cb06a8ca48 /skia/ext/platform_canvas_unittest.cc
parentab1773928ef4d27360a7e2dcb91d06f74d44d634 (diff)
downloadchromium_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/ext/platform_canvas_unittest.cc')
-rw-r--r--skia/ext/platform_canvas_unittest.cc8
1 files changed, 8 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