diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 20:04:50 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 20:04:50 +0000 |
| commit | 47add235920532afd026c068426701a27eb1154b (patch) | |
| tree | f6436a6b7aad24b65964be29bc62b855f765ccf0 /webkit/compositor_bindings | |
| parent | b2c548cdbc5707bdc59bd3dba5b16c774175d51d (diff) | |
| download | chromium_src-47add235920532afd026c068426701a27eb1154b.zip chromium_src-47add235920532afd026c068426701a27eb1154b.tar.gz chromium_src-47add235920532afd026c068426701a27eb1154b.tar.bz2 | |
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
Diffstat (limited to 'webkit/compositor_bindings')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index 85a0fec..e42a3c7 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/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; |