| 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);
|
|
|
|
|