diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
| commit | 060448534ff6b708ec19220c63c4d86efbe87b50 (patch) | |
| tree | 047be1f580e7da573c772006cdd5290ba1cdf824 /cc/debug | |
| parent | ed3e277f57affc9b369cb65e3720a1a8ee39b6e1 (diff) | |
| download | chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.zip chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.gz chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.bz2 | |
Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."
> cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
>
> And fix compile errors that it causes.
>
> Review URL: https://codereview.chromium.org/13206004
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/13316003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/debug')
| -rw-r--r-- | cc/debug/debug_colors.cc | 2 | ||||
| -rw-r--r-- | cc/debug/layer_tree_debug_state.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/debug/debug_colors.cc b/cc/debug/debug_colors.cc index 0680261..01e72bb 100644 --- a/cc/debug/debug_colors.cc +++ b/cc/debug/debug_colors.cc @@ -8,7 +8,7 @@ namespace cc { -static float Scale(float width, const LayerTreeImpl* tree_impl) { +static const float Scale(float width, const LayerTreeImpl* tree_impl) { return width * (tree_impl ? tree_impl->device_scale_factor() : 1); } diff --git a/cc/debug/layer_tree_debug_state.cc b/cc/debug/layer_tree_debug_state.cc index 9018be0..41b53e3 100644 --- a/cc/debug/layer_tree_debug_state.cc +++ b/cc/debug/layer_tree_debug_state.cc @@ -22,8 +22,8 @@ LayerTreeDebugState::LayerTreeDebugState() show_occluding_rects(false), show_non_occluding_rects(false), slow_down_raster_scale_factor(0), - trace_all_rendered_frames(false), - record_rendering_stats_(false) {} + record_rendering_stats_(false), + trace_all_rendered_frames(false) {} LayerTreeDebugState::~LayerTreeDebugState() {} |