First draft to enable turning off compositor for unit tests.

Tests will be re-enabled when appropriate changes are made to support GL compositor testing.

BUG=unit tests not ready for GL compositor at this time.
TEST=unit tests run to completion.

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

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

chrome/test/unit/chrome_test_suite.cc

@@ -21,6 +21,9 @@
 #include "net/base/net_errors.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#if defined(TOOLKIT_VIEWS)
+#include "views/view.h"
+#endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
@@ -141,6 +144,11 @@ void ChromeTestSuite::Initialize() {
   RemoveSharedMemoryFile(stats_filename_);
   stats_table_ = new base::StatsTable(stats_filename_, 20, 200);
   base::StatsTable::set_current(stats_table_);
+
+#if defined(TOUCH_UI)
+  // Turn of GPU compositing in browser during unit tests.
+  views::View::set_use_acceleration_when_possible(false);
+#endif
 }
 
 void ChromeTestSuite::Shutdown() {

ui/gfx/compositor/compositor_gl.cc

@@ -357,9 +357,9 @@ bool CompositorGL::InitShaders() {
 
 // static
 Compositor* Compositor::Create(gfx::AcceleratedWidget widget) {
- gfx::GLSurface::InitializeOneOff();
- if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)
-   return new glHidden::CompositorGL(widget);
+  gfx::GLSurface::InitializeOneOff();
+  if (gfx::GetGLImplementation() != gfx::kGLImplementationNone)
+    return new glHidden::CompositorGL(widget);
   return NULL;
 }
 #else

views/run_all_unittests.cc

@@ -6,6 +6,7 @@
 #include "base/test/test_suite.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "views/view.h"
 
 class ViewTestSuite : public base::TestSuite {
  public:
@@ -17,6 +18,11 @@ class ViewTestSuite : public base::TestSuite {
     ui::RegisterPathProvider();
     base::TestSuite::Initialize();
     ResourceBundle::InitSharedInstance("en-US");
+
+#if defined(TOUCH_UI)
+    // Disable GPU browser compositor during unit tests.
+    views::View::set_use_acceleration_when_possible(false);
+#endif
   }
 };
 

views/view.cc

@@ -762,6 +762,11 @@ void View::set_use_acceleration_when_possible(bool use) {
   use_acceleration_when_possible = use;
 }
 
+// static
+bool View::get_use_acceleration_when_possible() {
+  return use_acceleration_when_possible;
+}
+
 // Input -----------------------------------------------------------------------
 
 View* View::GetEventHandlerForPoint(const gfx::Point& point) {

views/view.h

@@ -546,6 +546,7 @@ class View : public AcceleratorTarget {
 
   // Enable/Disable accelerated compositing.
   static void set_use_acceleration_when_possible(bool use);
+  static bool get_use_acceleration_when_possible();
 
   // Input ---------------------------------------------------------------------
   // The points (and mouse locations) in the following functions are in the

views/widget/widget.cc

@@ -757,7 +757,8 @@ void Widget::EnsureCompositor() {
   // TODO(sad): If there is a parent Widget, then use the same compositor
   //            instead of creating a new one here.
   gfx::AcceleratedWidget widget = native_widget_->GetAcceleratedWidget();
-  if (widget != gfx::kNullAcceleratedWidget)
+  if (widget != gfx::kNullAcceleratedWidget &&
+                View::get_use_acceleration_when_possible())
     compositor_ = ui::Compositor::Create(widget);
 }