diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 18:19:08 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 18:19:08 +0000 |
| commit | ce638d154c6e8618b8df761115a5a9e2c9d8a106 (patch) | |
| tree | faff62a8bee25f77d93d6837b121ca8fa639bf29 /cc/debug | |
| parent | e5bd68e150c9d2b46187d2d1a7d948f709760d34 (diff) | |
| download | chromium_src-ce638d154c6e8618b8df761115a5a9e2c9d8a106.zip chromium_src-ce638d154c6e8618b8df761115a5a9e2c9d8a106.tar.gz chromium_src-ce638d154c6e8618b8df761115a5a9e2c9d8a106.tar.bz2 | |
cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
And fix compile errors that it causes.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191364
Review URL: https://codereview.chromium.org/13206004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191400 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 01e72bb..0680261 100644 --- a/cc/debug/debug_colors.cc +++ b/cc/debug/debug_colors.cc @@ -8,7 +8,7 @@ namespace cc { -static const float Scale(float width, const LayerTreeImpl* tree_impl) { +static 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 41b53e3..9018be0 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), - record_rendering_stats_(false), - trace_all_rendered_frames(false) {} + trace_all_rendered_frames(false), + record_rendering_stats_(false) {} LayerTreeDebugState::~LayerTreeDebugState() {} |