Makes tests either use mock compositor or mock WebGraphicsContext3D

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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
-#include "ui/gfx/compositor/test/test_compositor.h"
-#include "ui/gfx/compositor/test/test_texture.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/button_dropdown.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
 #include "ui/views/focus/accelerator_handler.h"
@@ skipping 2492 matching lines @@
 #else
     return widget()->GetRootView()->layer();
 #endif
   }
 
   virtual void SetUp() OVERRIDE {
     ViewTest::SetUp();
     old_use_acceleration_ = View::get_use_acceleration_when_possible();
     View::set_use_acceleration_when_possible(true);
 
-    ui::TestTexture::reset_live_count();
-
     widget_ = new Widget;
     Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(50, 50, 200, 200);
     widget_->Init(params);
     widget_->Show();
     widget_->GetRootView()->SetBounds(0, 0, 200, 200);
   }
 
   virtual void TearDown() OVERRIDE {
     View::set_use_acceleration_when_possible(old_use_acceleration_);
@@ skipping 44 matching lines @@
 #if defined(USE_AURA)
   ui::Layer* root_layer = NULL;
   gfx::Point origin;
   widget()->CalculateOffsetToAncestorWithLayer(&origin, &root_layer);
 #else
   ui::Layer* root_layer = widget()->GetRootView()->layer();
 #endif
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  // TODO(piman): with the webkit compositor, we don't create Textures on
-  // Layers. We're not supposed to be calling Layer::DrawTree. This test needs
-  // refactoring to fully work in that case.
-  root_layer->DrawTree();
-  ui::TestTexture::reset_live_count();
-#endif
-
   // Create v1, give it a bounds and verify everything is set up correctly.
   View* v1 = new View;
   v1->SetPaintToLayer(true);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(0, ui::TestTexture::live_count());
-#endif
   EXPECT_TRUE(v1->layer() != NULL);
   v1->SetBounds(20, 30, 140, 150);
   content_view->AddChildView(v1);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(1, ui::TestTexture::live_count());
-#endif
   ASSERT_TRUE(v1->layer() != NULL);
   EXPECT_EQ(root_layer, v1->layer()->parent());
   EXPECT_EQ(gfx::Rect(20, 30, 140, 150), v1->layer()->bounds());
 
   // Create v2 as a child of v1 and do basic assertion testing.
   View* v2 = new View;
   v1->AddChildView(v2);
   EXPECT_TRUE(v2->layer() == NULL);
   v2->SetBounds(10, 20, 30, 40);
   v2->SetPaintToLayer(true);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(2, ui::TestTexture::live_count());
-#endif
   ASSERT_TRUE(v2->layer() != NULL);
   EXPECT_EQ(v1->layer(), v2->layer()->parent());
   EXPECT_EQ(gfx::Rect(10, 20, 30, 40), v2->layer()->bounds());
 
   // Turn off v1s layer. v2 should still have a layer but its parent should have
   // changed.
   v1->SetPaintToLayer(false);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(1, ui::TestTexture::live_count());
-#endif
   EXPECT_TRUE(v1->layer() == NULL);
   EXPECT_TRUE(v2->layer() != NULL);
   EXPECT_EQ(root_layer, v2->layer()->parent());
   ASSERT_EQ(1u, root_layer->children().size());
   EXPECT_EQ(root_layer->children()[0], v2->layer());
   // The bounds of the layer should have changed to be relative to the root view
   // now.
   EXPECT_EQ(gfx::Rect(30, 50, 30, 40), v2->layer()->bounds());
 
   // Make v1 have a layer again and verify v2s layer is wired up correctly.
   ui::Transform transform;
   transform.SetScale(2.0f, 2.0f);
   v1->SetTransform(transform);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(2, ui::TestTexture::live_count());
-#endif
   EXPECT_TRUE(v1->layer() != NULL);
   EXPECT_TRUE(v2->layer() != NULL);
   EXPECT_EQ(root_layer, v1->layer()->parent());
   EXPECT_EQ(v1->layer(), v2->layer()->parent());
   ASSERT_EQ(1u, root_layer->children().size());
   EXPECT_EQ(root_layer->children()[0], v1->layer());
   ASSERT_EQ(1u, v1->layer()->children().size());
   EXPECT_EQ(v1->layer()->children()[0], v2->layer());
   EXPECT_EQ(gfx::Rect(10, 20, 30, 40), v2->layer()->bounds());
 }
@@ skipping 385 matching lines @@
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views