cc: Chromify VideoLayer

R=danakj@chromium.org
BUG=none


Review URL: https://chromiumcodereview.appspot.com/12814002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187801 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 18 insertions, 24 deletions

diff --git a/cc/video_layer.cc b/cc/video_layer.cc
index d33d624..06daf76 100644
--- a/cc/video_layer.cc
+++ b/cc/video_layer.cc
@@ -8,24 +8,18 @@
 
 namespace cc {
 
-scoped_refptr<VideoLayer> VideoLayer::Create(VideoFrameProvider* provider)
-{
-    return make_scoped_refptr(new VideoLayer(provider));
+scoped_refptr<VideoLayer> VideoLayer::Create(VideoFrameProvider* provider) {
+  return make_scoped_refptr(new VideoLayer(provider));
 }
 
-VideoLayer::VideoLayer(VideoFrameProvider* provider)
-    : m_provider(provider)
-{
-    DCHECK(m_provider);
+VideoLayer::VideoLayer(VideoFrameProvider* provider) : provider_(provider) {
+  DCHECK(provider_);
 }
 
-VideoLayer::~VideoLayer()
-{
-}
+VideoLayer::~VideoLayer() {}
 
-scoped_ptr<LayerImpl> VideoLayer::CreateLayerImpl(LayerTreeImpl* treeImpl)
-{
-    return VideoLayerImpl::Create(treeImpl, id(), m_provider).PassAs<LayerImpl>();
+scoped_ptr<LayerImpl> VideoLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) {
+  return VideoLayerImpl::Create(tree_impl, id(), provider_).PassAs<LayerImpl>();
 }
 
 }  // namespace cc
diff --git a/cc/video_layer.h b/cc/video_layer.h
index 4dcc997..2c4f17b 100644
--- a/cc/video_layer.h
+++ b/cc/video_layer.h
@@ -9,9 +9,7 @@
 #include "cc/cc_export.h"
 #include "cc/layer.h"
 
-namespace media {
-class VideoFrame;
-}
+namespace media { class VideoFrame; }
 
 namespace cc {
 
@@ -20,17 +18,19 @@ class VideoLayerImpl;
 
 // A Layer that contains a Video element.
 class CC_EXPORT VideoLayer : public Layer {
-public:
-    static scoped_refptr<VideoLayer> Create(VideoFrameProvider*);
+ public:
+  static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider);
 
-    virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* treeImpl) OVERRIDE;
+  virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
+      OVERRIDE;
 
-private:
-    explicit VideoLayer(VideoFrameProvider*);
-    virtual ~VideoLayer();
+ private:
+  explicit VideoLayer(VideoFrameProvider* provider);
+  virtual ~VideoLayer();
 
-    // This pointer is only for passing to VideoLayerImpl's constructor. It should never be dereferenced by this class.
-    VideoFrameProvider* m_provider;
+  // This pointer is only for passing to VideoLayerImpl's constructor. It should
+  // never be dereferenced by this class.
+  VideoFrameProvider* provider_;
 };
 
 }  // namespace cc