diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 01:47:44 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 01:47:44 +0000 |
| commit | 3dce37234c2bdbd6f5114eca99ef65bf661f6fb9 (patch) | |
| tree | 8989263baf7d330444e5828d790bb99fa45113f1 /webkit | |
| parent | e3806df6c8c07d29a50ee5493f4c0e81f63e9837 (diff) | |
| download | chromium_src-3dce37234c2bdbd6f5114eca99ef65bf661f6fb9.zip chromium_src-3dce37234c2bdbd6f5114eca99ef65bf661f6fb9.tar.gz chromium_src-3dce37234c2bdbd6f5114eca99ef65bf661f6fb9.tar.bz2 | |
cc: Add support for debugging layer borders directly in the compositor
Instead of supporting --show-composited-layer-borders via the GraphicsLayer
debug borders mechanism, show debug borders on layers when the new
LayerTreeSetting flag showDebugBorders is enabled.
This depends on https://bugs.webkit.org/show_bug.cgi?id=102130
BUG=159769
R=jamesr,enne
Review URL: https://chromiumcodereview.appspot.com/11365239
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_layer_impl.h | 5 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc index 7856d2c..ce31234 100644 --- a/webkit/compositor_bindings/web_layer_impl.cc +++ b/webkit/compositor_bindings/web_layer_impl.cc @@ -278,12 +278,12 @@ void WebLayerImpl::setFilter(SkImageFilter* filter) void WebLayerImpl::setDebugBorderColor(const WebColor& color) { - m_layer->setDebugBorderColor(color); + NOTREACHED(); } void WebLayerImpl::setDebugBorderWidth(float width) { - m_layer->setDebugBorderWidth(width); + NOTREACHED(); } void WebLayerImpl::setDebugName(WebString name) diff --git a/webkit/compositor_bindings/web_layer_impl.h b/webkit/compositor_bindings/web_layer_impl.h index 639baf1..97324f0 100644 --- a/webkit/compositor_bindings/web_layer_impl.h +++ b/webkit/compositor_bindings/web_layer_impl.h @@ -63,8 +63,9 @@ public: virtual void setFilter(SkImageFilter*); virtual void setFilters(const WebFilterOperations&) OVERRIDE; virtual void setBackgroundFilters(const WebFilterOperations&) OVERRIDE; - virtual void setDebugBorderColor(const WebColor&) OVERRIDE; - virtual void setDebugBorderWidth(float) OVERRIDE; + // TODO(danakj): remove the debug border setters + virtual void setDebugBorderColor(const WebColor&); + virtual void setDebugBorderWidth(float); virtual void setDebugName(WebString) OVERRIDE; virtual void setAnimationDelegate(WebAnimationDelegate*) OVERRIDE; virtual bool addAnimation(WebAnimation*) OVERRIDE; diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index ffb0f9d..571fadb 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -36,6 +36,7 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti { LayerTreeSettings settings; settings.acceleratePainting = webSettings.acceleratePainting; + settings.showDebugBorders = webSettings.showDebugBorders; settings.showPlatformLayerTree = webSettings.showPlatformLayerTree; settings.showPaintRects = webSettings.showPaintRects; settings.renderVSyncEnabled = webSettings.renderVSyncEnabled; |