Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: ui/views/view_unittest.cc

Issue 8565019: aura: Use WebKit compositor by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view_unittest.cc
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 4aa93b03482b3ffc0a6675586a000614281afe12..0fd4c21e4bdea4f6e5449b8e578eb5f4def3934e 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -2818,9 +2818,18 @@ TEST_F(ViewLayerTest, ToggleVisibilityWithLayer) {
EXPECT_TRUE(v1->layer()->IsDrawn());
}
+// We don't set the hole in the webkit compositor, so disable tests that rely on
+// it.
+#if defined(USE_WEBKIT_COMPOSITOR)
+#define NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(X) DISABLED_ ## X
+#else
+#define NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(X) X
+#endif
+
// Test that a hole in a layer is correctly created regardless of whether
// the opacity attribute is set before or after the layer is created.
-TEST_F(ViewLayerTest, ToggleOpacityWithLayer) {
+TEST_F(ViewLayerTest,
+ NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(ToggleOpacityWithLayer)) {
View* content_view = new View;
widget()->SetContentsView(content_view);
@@ -2850,7 +2859,8 @@ TEST_F(ViewLayerTest, ToggleOpacityWithLayer) {
// Test that a hole in a layer always corresponds to the bounds of opaque
// layers.
-TEST_F(ViewLayerTest, MultipleOpaqueLayers) {
+TEST_F(ViewLayerTest,
+ NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(MultipleOpaqueLayers)) {
View* content_view = new View;
widget()->SetContentsView(content_view);
@@ -2891,7 +2901,8 @@ TEST_F(ViewLayerTest, MultipleOpaqueLayers) {
}
// Makes sure that opacity of layer persists after toggling visibilty.
-TEST_F(ViewLayerTest, ToggleVisibilityWithOpaqueLayer) {
+TEST_F(ViewLayerTest,
+ NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(ToggleVisibilityWithOpaqueLayer)) {
View* content_view = new View;
widget()->SetContentsView(content_view);
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698