diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 17:40:11 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 17:40:11 +0000 |
commit | 38a5af307cdff31ba0c0050e7354bbc86d98f8f4 (patch) | |
tree | f2b962a30f700c05fa5bce11f04b00e2a26bb2d5 /cc | |
parent | 30b555fd08b20a30eba5ba1da70a053552f85ce7 (diff) | |
download | chromium_src-38a5af307cdff31ba0c0050e7354bbc86d98f8f4.zip chromium_src-38a5af307cdff31ba0c0050e7354bbc86d98f8f4.tar.gz chromium_src-38a5af307cdff31ba0c0050e7354bbc86d98f8f4.tar.bz2 |
cc: Fix constructor initialization style.
Style-only change. Move the commas to the end of the line.
R=jamesr
Review URL: https://codereview.chromium.org/13254004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r-- | cc/layers/delegated_renderer_layer_impl_unittest.cc | 4 | ||||
-rw-r--r-- | cc/output/gl_renderer_unittest.cc | 10 | ||||
-rw-r--r-- | cc/output/shader.cc | 40 | ||||
-rw-r--r-- | cc/resources/tile_priority.h | 9 | ||||
-rw-r--r-- | cc/test/animation_test_common.cc | 4 | ||||
-rw-r--r-- | cc/trees/layer_tree_host_unittest_animation.cc | 6 |
6 files changed, 35 insertions, 38 deletions
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc index bdff25f..87028f8 100644 --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc @@ -33,8 +33,8 @@ namespace { class DelegatedRendererLayerImplTest : public testing::Test { public: DelegatedRendererLayerImplTest() - : proxy_(scoped_ptr<Thread>(NULL)) - , always_impl_thread_and_main_thread_blocked_(&proxy_) { + : proxy_(scoped_ptr<Thread>(NULL)), + always_impl_thread_and_main_thread_blocked_(&proxy_) { LayerTreeSettings settings; settings.minimum_occlusion_tracking_size = gfx::Size(); diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc index 673e7cc..9a7f281 100644 --- a/cc/output/gl_renderer_unittest.cc +++ b/cc/output/gl_renderer_unittest.cc @@ -258,12 +258,12 @@ class GLRendererTest : public testing::Test { } // namespace class GLRendererShaderTest : public testing::Test { -protected: + protected: GLRendererShaderTest() - : output_surface_(FakeOutputSurface::Create3d()) - , resource_provider_(ResourceProvider::Create(output_surface_.get())) - , renderer_(GLRenderer::Create(&mock_client_, output_surface_.get(), resource_provider_.get())) - { + : output_surface_(FakeOutputSurface::Create3d()), + resource_provider_(ResourceProvider::Create(output_surface_.get())), + renderer_(GLRenderer::Create(&mock_client_, output_surface_.get(), + resource_provider_.get())) { } void TestRenderPassProgram() { diff --git a/cc/output/shader.cc b/cc/output/shader.cc index f07d099..988f6e1 100644 --- a/cc/output/shader.cc +++ b/cc/output/shader.cc @@ -421,10 +421,10 @@ void FragmentTexAlphaBinding::Init(WebGraphicsContext3D* context, } FragmentTexColorMatrixAlphaBinding::FragmentTexColorMatrixAlphaBinding() - : sampler_location_(-1) - , alpha_location_(-1) - , color_matrix_location_(-1) - , color_offset_location_(-1) {} + : sampler_location_(-1), + alpha_location_(-1), + color_matrix_location_(-1), + color_offset_location_(-1) {} void FragmentTexColorMatrixAlphaBinding::Init(WebGraphicsContext3D* context, unsigned program, @@ -907,13 +907,13 @@ std::string FragmentShaderRGBATexAlphaMaskAA::GetShaderString() const { FragmentShaderRGBATexAlphaMaskColorMatrixAA:: FragmentShaderRGBATexAlphaMaskColorMatrixAA() - : sampler_location_(-1) - , mask_sampler_location_(-1) - , alpha_location_(-1) - , edge_location_(-1) - , mask_tex_coord_scale_location_(-1) - , color_matrix_location_(-1) - , color_offset_location_(-1) {} + : sampler_location_(-1), + mask_sampler_location_(-1), + alpha_location_(-1), + edge_location_(-1), + mask_tex_coord_scale_location_(-1), + color_matrix_location_(-1), + color_offset_location_(-1) {} void FragmentShaderRGBATexAlphaMaskColorMatrixAA::Init( WebGraphicsContext3D* context, @@ -997,11 +997,11 @@ std::string FragmentShaderRGBATexAlphaMaskColorMatrixAA::GetShaderString() FragmentShaderRGBATexAlphaColorMatrixAA:: FragmentShaderRGBATexAlphaColorMatrixAA() - : sampler_location_(-1) - , alpha_location_(-1) - , edge_location_(-1) - , color_matrix_location_(-1) - , color_offset_location_(-1) {} + : sampler_location_(-1), + alpha_location_(-1), + edge_location_(-1), + color_matrix_location_(-1), + color_offset_location_(-1) {} void FragmentShaderRGBATexAlphaColorMatrixAA::Init( WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, @@ -1067,10 +1067,10 @@ std::string FragmentShaderRGBATexAlphaColorMatrixAA::GetShaderString() const { FragmentShaderRGBATexAlphaMaskColorMatrix:: FragmentShaderRGBATexAlphaMaskColorMatrix() - : sampler_location_(-1) - , mask_sampler_location_(-1) - , alpha_location_(-1) - , mask_tex_coord_scale_location_(-1) {} + : sampler_location_(-1), + mask_sampler_location_(-1), + alpha_location_(-1), + mask_tex_coord_scale_location_(-1) {} void FragmentShaderRGBATexAlphaMaskColorMatrix::Init( WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, diff --git a/cc/resources/tile_priority.h b/cc/resources/tile_priority.h index c128b90..1cf7eb6 100644 --- a/cc/resources/tile_priority.h +++ b/cc/resources/tile_priority.h @@ -174,11 +174,10 @@ scoped_ptr<base::Value> TreePriorityAsValue(TreePriority prio); class GlobalStateThatImpactsTilePriority { public: GlobalStateThatImpactsTilePriority() - : memory_limit_policy(ALLOW_NOTHING) - , memory_limit_in_bytes(0) - , unused_memory_limit_in_bytes(0) - , tree_priority(SAME_PRIORITY_FOR_BOTH_TREES) { - } + : memory_limit_policy(ALLOW_NOTHING), + memory_limit_in_bytes(0), + unused_memory_limit_in_bytes(0), + tree_priority(SAME_PRIORITY_FOR_BOTH_TREES) {} TileMemoryLimitPolicy memory_limit_policy; diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index 21e4583..51e89f6 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -130,9 +130,7 @@ scoped_ptr<cc::AnimationCurve> FakeTransformTransition::Clone() const { FakeFloatTransition::FakeFloatTransition(double duration, float from, float to) - : duration_(duration) - , from_(from) - , to_(to) {} + : duration_(duration), from_(from), to_(to) {} FakeFloatTransition::~FakeFloatTransition() {} diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index b6a79b3..ed41746 100644 --- a/cc/trees/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.cc @@ -112,9 +112,9 @@ class LayerTreeHostAnimationTestAddAnimation : public LayerTreeHostAnimationTest { public: LayerTreeHostAnimationTestAddAnimation() - : num_animates_(0) - , received_animation_started_notification_(false) - , start_time_(0.0) { + : num_animates_(0), + received_animation_started_notification_(false), + start_time_(0.0) { } virtual void BeginTest() OVERRIDE { |