Revert 112641 - aura: Use WebKit compositor by default

BUG=99524
TEST=compositor_unittests, views_unittests, aura_unittests...


Review URL: http://codereview.chromium.org/8565019

TBR=piman@chromium.org
Review URL: http://codereview.chromium.org/8775045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112645 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -51,6 +51,9 @@
         'use_virtual_keyboard%': '<(use_virtual_keyboard)',
         'use_skia_on_mac%': '<(use_skia_on_mac)',
 
+        # WebKit compositor for ui
+        'use_webkit_compositor%': 0,
+
         # Compute the architecture that we're building on.
         'conditions': [
           [ 'OS=="win" or OS=="mac"', {
@@ -74,13 +77,6 @@
           ['use_aura==1', {
             'views_compositor%': 1,
           }],
-
-          # Use the WebKit compositor for ui, when Aura is on.
-          ['use_aura==1', {
-            'use_webkit_compositor%': 1,
-          }, {
-            'use_webkit_compositor%': 0,
-          }],
         ],
       },
 

ui/views/view_unittest.cc

@@ -2818,18 +2818,9 @@ 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,
-       NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(ToggleOpacityWithLayer)) {
+TEST_F(ViewLayerTest, ToggleOpacityWithLayer) {
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
@@ -2859,8 +2850,7 @@ TEST_F(ViewLayerTest,
 
 // 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 @@ TEST_F(ViewLayerTest,
 }
 
 // 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);