Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

ui/gfx/compositor/compositor_cc.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 "ui/gfx/compositor/compositor_cc.h"
 
 #include "base/command_line.h"
 #include "third_party/skia/include/images/SkImageEncoder.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "ui/gfx/compositor/compositor_switches.h"
 #include "ui/gfx/compositor/test_web_graphics_context_3d.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/scoped_make_current.h"
 #include "webkit/glue/webthread_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 namespace {
-
 webkit_glue::WebThreadImpl* g_compositor_thread = NULL;
-
-// If true a context is used that results in no rendering to the screen.
-bool test_context_enabled = false;
-
 }  // anonymous namespace
 
 namespace ui {
 
 SharedResourcesCC::SharedResourcesCC() : initialized_(false) {
 }
 
 
 SharedResourcesCC::~SharedResourcesCC() {
 }
@@ skipping 78 matching lines @@
                           const gfx::Point& origin,
                           const gfx::Size& overall_size) {
   NOTREACHED();
 }
 
 void TextureCC::Draw(const ui::TextureDrawParams& params,
                      const gfx::Rect& clip_bounds_in_texture) {
   NOTREACHED();
 }
 
+// static
+bool CompositorCC::test_context_enabled_ = false;
+
 CompositorCC::CompositorCC(CompositorDelegate* delegate,
                            gfx::AcceleratedWidget widget,
                            const gfx::Size& size)
     : Compositor(delegate, size),
       widget_(widget),
       root_web_layer_(WebKit::WebLayer::create(this)) {
   WebKit::WebLayerTreeView::Settings settings;
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   settings.showFPSCounter =
      command_line->HasSwitch(switches::kUIShowFPSCounter);
@@ skipping 28 matching lines @@
 void CompositorCC::Terminate() {
 #ifdef WEBCOMPOSITOR_HAS_INITIALIZE
   WebKit::WebCompositor::shutdown();
 #endif
   if (g_compositor_thread) {
     delete g_compositor_thread;
     g_compositor_thread = NULL;
   }
 }
 
+// static
+void CompositorCC::EnableTestContextIfNecessary() {
+  // TODO: only do this if command line param not set.
+  test_context_enabled_ = true;
+}
+
 Texture* CompositorCC::CreateTexture() {
   NOTREACHED();
   return NULL;
 }
 
 void CompositorCC::Blur(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 void CompositorCC::ScheduleDraw() {
@@ skipping 49 matching lines @@
 
 void CompositorCC::applyScrollAndScale(const WebKit::WebSize& scrollDelta,
                                        float scaleFactor) {
 }
 
 void CompositorCC::applyScrollDelta(const WebKit::WebSize&) {
 }
 
 WebKit::WebGraphicsContext3D* CompositorCC::createContext3D() {
   WebKit::WebGraphicsContext3D* context;
-  if (test_context_enabled) {
+  if (test_context_enabled_) {
     context = new TestWebGraphicsContext3D();
   } else {
     gfx::GLShareGroup* share_group =
         SharedResourcesCC::GetInstance()->GetShareGroup();
     context = new webkit::gpu::WebGraphicsContext3DInProcessImpl(
         widget_, share_group);
   }
   WebKit::WebGraphicsContext3D::Attributes attrs;
   context->initialize(attrs, 0, true);
 
@@ skipping 18 matching lines @@
 void CompositorCC::notifyNeedsComposite() {
   ScheduleDraw();
 }
 
 Compositor* Compositor::Create(CompositorDelegate* owner,
                                gfx::AcceleratedWidget widget,
                                const gfx::Size& size) {
   return new CompositorCC(owner, widget, size);
 }
 
-COMPOSITOR_EXPORT void SetupTestCompositor() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableTestCompositor)) {
-    test_context_enabled = true;
-  }
-}
-
-COMPOSITOR_EXPORT void DisableTestCompositor() {
-  test_context_enabled = false;
-}
-
 }  // namespace ui