From ce638d154c6e8618b8df761115a5a9e2c9d8a106 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Fri, 29 Mar 2013 18:19:08 +0000 Subject: =?UTF-8?q?cc:=20Add=20=E2=80=98chromium=5Fcode=E2=80=99:=201=20to?= =?UTF-8?q?=20cc.gyp=20and=20cc=5Ftests.gyp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- cc/debug/debug_colors.cc | 2 +- cc/debug/layer_tree_debug_state.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cc/debug') 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() {} -- cgit v1.1