Revert 112641 - aura: Use WebKit compositor by default

ui/views/view_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 2800 matching lines @@
   v1->SetVisible(true);
   EXPECT_TRUE(v1->layer()->IsDrawn());
 
   widget()->Hide();
   EXPECT_FALSE(v1->layer()->IsDrawn());
 
   widget()->Show();
   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);
 
   View* parent_view = new View;
   content_view->AddChildView(parent_view);
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
 
   View* child_view = new View;
   child_view->SetBounds(50, 50, 100, 100);
   parent_view->AddChildView(child_view);
 
   widget()->GetCompositor()->Draw(false);
 
   ASSERT_TRUE(child_view->layer() == NULL);
   child_view->SetPaintToLayer(true);
   child_view->SetFillsBoundsOpaquely(true);
   widget()->GetCompositor()->Draw(false);
   ASSERT_TRUE(child_view->layer());
   EXPECT_EQ(
       gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
 
   child_view->SetFillsBoundsOpaquely(false);
   widget()->GetCompositor()->Draw(false);
   EXPECT_TRUE(parent_view->layer()->hole_rect().IsEmpty());
 }
 
 // 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);
 
   View* parent_view = new View;
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
   content_view->AddChildView(parent_view);
 
   View* child_view1 = new View;
   child_view1->SetPaintToLayer(true);
@@ skipping 20 matching lines @@
       gfx::Rect(50, 50, 100, 100) == parent_view->layer()->hole_rect() ||
       gfx::Rect(150, 150, 200, 200) == parent_view->layer()->hole_rect());
 
   // Only child_view2 is opaque
   delete child_view1;
   EXPECT_EQ(
       gfx::Rect(150, 150, 200, 200), parent_view->layer()->hole_rect());
 }
 
 // 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);
 
   View* parent_view = new View;
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
   content_view->AddChildView(parent_view);
 
   parent_view->SetPaintToLayer(true);
   parent_view->SetBounds(0, 0, 400, 400);
@@ skipping 154 matching lines @@
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views