diff options
| author | ajuma <ajuma@chromium.org> | 2015-10-20 07:46:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 14:47:27 +0000 |
| commit | d19e88b1f9898699ae510dc89c3f3dacdab59637 (patch) | |
| tree | 79f459773b08ef9bdd0f4d5d4317292de0c85b38 /cc | |
| parent | 02d6170c5b0ba4bfe0a09c46f9523b4a49f05a80 (diff) | |
| download | chromium_src-d19e88b1f9898699ae510dc89c3f3dacdab59637.zip chromium_src-d19e88b1f9898699ae510dc89c3f3dacdab59637.tar.gz chromium_src-d19e88b1f9898699ae510dc89c3f3dacdab59637.tar.bz2 | |
Revert of Always call LayerImpl::SetDebugInfo in debug builds. (patchset #1 id:1 of https://codereview.chromium.org/1414503005/ )
Reason for revert:
This broke ContextLost.WebGLContextLostInHiddenTab in context_lost_tests on the GPU debug bots. e.g.:
http://build.chromium.org/p/chromium.gpu/builders/Linux%20Debug%20%28NVIDIA%29/builds/52223
http://build.chromium.org/p/chromium.gpu/builders/Mac%20Retina%20Debug/builds/40211
http://build.chromium.org/p/chromium.gpu/builders/Mac%2010.10%20Debug%20%28ATI%29/builds/5820
Verified locally that reverting this fixes the test.
Original issue's description:
> Always call LayerImpl::SetDebugInfo in debug builds.
>
> This makes debugging easier. :)
>
> Committed: https://crrev.com/b7e166f0dba00d2c9737d2ece0d7b22976506de2
> Cr-Commit-Position: refs/heads/master@{#354927}
TBR=enne@chromium.org,skobes@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1413363002
Cr-Commit-Position: refs/heads/master@{#355057}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/layers/layer.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index d1a95bc..9db5286 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -1184,12 +1184,8 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { layer->SetBounds(use_paint_properties ? paint_properties_.bounds : bounds_); -#if defined(NDEBUG) if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots()) layer->SetDebugInfo(TakeDebugInfo()); -#else - layer->SetDebugInfo(TakeDebugInfo()); -#endif layer->SetTransformTreeIndex(transform_tree_index()); layer->SetEffectTreeIndex(effect_tree_index()); |