cc: Don't apply --enable-impl-side-painting to browser compositor

Checking the command line in LayerTreeSettings is dangerous, as both the
browser and the renderer will have the same command line args.  Moving this
flag first, as it causes asserts in debug for --enable-impl-side-painting.  The
other flags can be moved separately.

R=danakj@chromium.org
BUG=169173,155209


Review URL: https://chromiumcodereview.appspot.com/11829052

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

cc/layer_tree_settings.cc

@@ -38,7 +38,6 @@ LayerTreeSettings::LayerTreeSettings()
 {
     // TODO(danakj): Move this to chromium when we don't go through the WebKit API anymore.
     compositorFrameMessage = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableCompositorFrameMessage);
-    implSidePainting = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableImplSidePainting);
     partialSwapEnabled = CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePartialSwap);
     backgroundColorInsteadOfCheckerboard = CommandLine::ForCurrentProcess()->HasSwitch(switches::kBackgroundColorInsteadOfCheckerboard);
     showOverdrawInTracing = CommandLine::ForCurrentProcess()->HasSwitch(switches::kTraceOverdraw);

webkit/compositor_bindings/web_layer_tree_view_impl.cc

@@ -50,6 +50,7 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
     settings.initialDebugState.showPaintRects = webSettings.showPaintRects;
     settings.initialDebugState.showPlatformLayerTree = webSettings.showPlatformLayerTree;
     settings.initialDebugState.showDebugBorders = webSettings.showDebugBorders;
+    settings.implSidePainting = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableImplSidePainting);
     m_layerTreeHost = LayerTreeHost::create(this, settings, implThread.Pass());
     if (!m_layerTreeHost.get())
         return false;