diff options
author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 21:15:06 +0000 |
---|---|---|
committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 21:15:06 +0000 |
commit | bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d (patch) | |
tree | dba84d59df6abc81803ce0191ccb78c42d4ca55b /cc/trees/layer_tree_impl.h | |
parent | 01fc514f488305c0c57038c3d5c7b28eb09df4cd (diff) | |
download | chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.zip chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.gz chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.bz2 |
Fix cpplint errors in cc/(animation|input|layers|trees|test)/
This fixes lint errors in everything except for the few stragglers (occlusion unit test, etc) that haven't been chromified.
BUG=144577
Review URL: https://chromiumcodereview.appspot.com/12965007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_impl.h')
-rw-r--r-- | cc/trees/layer_tree_impl.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h index 1f89d16..1aaf3ba 100644 --- a/cc/trees/layer_tree_impl.h +++ b/cc/trees/layer_tree_impl.h @@ -5,6 +5,9 @@ #ifndef CC_TREES_LAYER_TREE_IMPL_H_ #define CC_TREES_LAYER_TREE_IMPL_H_ +#include <string> +#include <vector> + #include "base/hash_tables.h" #include "base/values.h" #include "cc/layers/layer_impl.h" @@ -17,8 +20,8 @@ struct hash<cc::LayerImpl*> { return hash<size_t>()(reinterpret_cast<size_t>(ptr)); } }; -} // namespace BASE_HASH_NAMESPACE -#endif // COMPILER +} // namespace BASE_HASH_NAMESPACE +#endif // COMPILER namespace cc { @@ -88,7 +91,7 @@ class CC_EXPORT LayerTreeImpl { void SetRootLayer(scoped_ptr<LayerImpl>); scoped_ptr<LayerImpl> DetachLayerTree(); - void PushPropertiesTo(LayerTreeImpl*); + void PushPropertiesTo(LayerTreeImpl* tree_impl); int source_frame_number() const { return source_frame_number_; } void set_source_frame_number(int frame_number) { @@ -198,7 +201,7 @@ class CC_EXPORT LayerTreeImpl { void DidEndScroll(); protected: - LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl); + explicit LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl); void UpdateSolidColorScrollbars(); @@ -249,6 +252,6 @@ class CC_EXPORT LayerTreeImpl { DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); }; -} +} // namespace cc #endif // CC_TREES_LAYER_TREE_IMPL_H_ |