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

Unified Diff: ui/views/view_unittest.cc

Issue 8775045: Revert 112641 - aura: Use WebKit compositor by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
===================================================================
--- ui/views/view_unittest.cc (revision 112644)
+++ ui/views/view_unittest.cc (working copy)
@@ -2818,18 +2818,9 @@
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,
- NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(ToggleOpacityWithLayer)) {
+TEST_F(ViewLayerTest, ToggleOpacityWithLayer) {
View* content_view = new View;
widget()->SetContentsView(content_view);
@@ -2859,8 +2850,7 @@
// Test that a hole in a layer always corresponds to the bounds of opaque
// layers.
-TEST_F(ViewLayerTest,
- NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(MultipleOpaqueLayers)) {
+TEST_F(ViewLayerTest, MultipleOpaqueLayers) {
View* content_view = new View;
widget()->SetContentsView(content_view);
@@ -2901,8 +2891,7 @@
}
// Makes sure that opacity of layer persists after toggling visibilty.
-TEST_F(ViewLayerTest,
- NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(ToggleVisibilityWithOpaqueLayer)) {
+TEST_F(ViewLayerTest, 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