diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 21:03:46 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 21:03:46 +0000 |
| commit | c1ffd4759d14426a69fcc83e23d410bb93c7106d (patch) | |
| tree | f889a5fe7c119d5e9d4c977df6bd9b70e5d244dd /webkit | |
| parent | 940ed1d3ca01d6fee795a585cedfb3759bee03ab (diff) | |
| download | chromium_src-c1ffd4759d14426a69fcc83e23d410bb93c7106d.zip chromium_src-c1ffd4759d14426a69fcc83e23d410bb93c7106d.tar.gz chromium_src-c1ffd4759d14426a69fcc83e23d410bb93c7106d.tar.bz2 | |
[cc] Rename to --enable-impl-side-painting, route to render process, and expose on settings
I added an --enable on expectation that we'll eventually need a disable flag as this becomes more solid.
The rest should be straightforward, I think.
BUG=155209
R=enne@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/11413178
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/compositor_bindings/web_content_layer_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/webkit/compositor_bindings/web_content_layer_impl.cc b/webkit/compositor_bindings/web_content_layer_impl.cc index 853970d..6f75ee2 100644 --- a/webkit/compositor_bindings/web_content_layer_impl.cc +++ b/webkit/compositor_bindings/web_content_layer_impl.cc @@ -21,7 +21,7 @@ namespace WebKit { static bool usingPictureLayer() { - return CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kImplSidePainting); + return CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableImplSidePainting); } WebContentLayer* WebContentLayer::create(WebContentLayerClient* client) diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index a9702f3..d858a5b 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -4,10 +4,12 @@ #include "web_layer_tree_view_impl.h" +#include "base/command_line.h" #include "cc/font_atlas.h" #include "cc/input_handler.h" #include "cc/layer.h" #include "cc/layer_tree_host.h" +#include "cc/switches.h" #include "cc/thread.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h" @@ -37,6 +39,7 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti { LayerTreeSettings settings; settings.acceleratePainting = webSettings.acceleratePainting; + settings.implSidePainting = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableImplSidePainting); settings.showDebugBorders = webSettings.showDebugBorders; settings.showPlatformLayerTree = webSettings.showPlatformLayerTree; settings.showPaintRects = webSettings.showPaintRects; |