[CLOSED] Big patch.

ui/compositor/compositor.cc

 // Copyright (c) 2012 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/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 358 matching lines @@
   cc::LayerTreeSettings settings;
   settings.initialDebugState.showFPSCounter =
       command_line->HasSwitch(switches::kUIShowFPSCounter);
   settings.initialDebugState.showPlatformLayerTree =
       command_line->HasSwitch(switches::kUIShowLayerTree);
   settings.refreshRate =
       g_test_compositor_enabled ? kTestRefreshRate : kDefaultRefreshRate;
   settings.initialDebugState.showDebugBorders =
       command_line->HasSwitch(switches::kUIShowLayerBorders);
   settings.partialSwapEnabled =
-      command_line->HasSwitch(switches::kUIEnablePartialSwap);
+      command_line->HasSwitch(switches::kUIEnablePartialSwap) ||
+      command_line->HasSwitch(switches::kUIEnableSoftwareCompositing);
   settings.perTilePaintingEnabled =
       command_line->HasSwitch(switches::kUIEnablePerTilePainting);
 
   scoped_ptr<cc::Thread> thread;
   if (g_compositor_thread) {
     thread = cc::ThreadImpl::createForDifferentThread(
         g_compositor_thread->message_loop_proxy());
   }
 
   host_ = cc::LayerTreeHost::create(this, settings, thread.Pass());
@@ skipping 301 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   g_test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return g_test_compositor_enabled;
 }
 
 }  // namespace ui