Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Side by Side Diff: cc/layers/video_layer.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/video_frame_provider_client_impl.h ('k') | cc/layers/video_layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_LAYERS_VIDEO_LAYER_H_ 5 #ifndef CC_LAYERS_VIDEO_LAYER_H_
6 #define CC_LAYERS_VIDEO_LAYER_H_ 6 #define CC_LAYERS_VIDEO_LAYER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "cc/base/cc_export.h" 9 #include "cc/base/cc_export.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
11 #include "media/base/video_rotation.h" 11 #include "media/base/video_rotation.h"
12 12
13 namespace media { class VideoFrame; } 13 namespace media { class VideoFrame; }
14 14
15 namespace cc { 15 namespace cc {
16 16
17 class VideoFrameProvider; 17 class VideoFrameProvider;
18 class VideoLayerImpl; 18 class VideoLayerImpl;
19 19
20 // A Layer that contains a Video element. 20 // A Layer that contains a Video element.
21 class CC_EXPORT VideoLayer : public Layer { 21 class CC_EXPORT VideoLayer : public Layer {
22 public: 22 public:
23 static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider, 23 static scoped_refptr<VideoLayer> Create(VideoFrameProvider* provider,
24 media::VideoRotation video_rotation); 24 media::VideoRotation video_rotation);
25 25
26 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 26 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
27 OVERRIDE; 27 override;
28 28
29 virtual bool Update(ResourceUpdateQueue* queue, 29 virtual bool Update(ResourceUpdateQueue* queue,
30 const OcclusionTracker<Layer>* occlusion) OVERRIDE; 30 const OcclusionTracker<Layer>* occlusion) override;
31 31
32 private: 32 private:
33 VideoLayer(VideoFrameProvider* provider, media::VideoRotation video_rotation); 33 VideoLayer(VideoFrameProvider* provider, media::VideoRotation video_rotation);
34 virtual ~VideoLayer(); 34 virtual ~VideoLayer();
35 35
36 // This pointer is only for passing to VideoLayerImpl's constructor. It should 36 // This pointer is only for passing to VideoLayerImpl's constructor. It should
37 // never be dereferenced by this class. 37 // never be dereferenced by this class.
38 VideoFrameProvider* provider_; 38 VideoFrameProvider* provider_;
39 39
40 media::VideoRotation video_rotation_; 40 media::VideoRotation video_rotation_;
41 41
42 DISALLOW_COPY_AND_ASSIGN(VideoLayer); 42 DISALLOW_COPY_AND_ASSIGN(VideoLayer);
43 }; 43 };
44 44
45 } // namespace cc 45 } // namespace cc
46 46
47 #endif // CC_LAYERS_VIDEO_LAYER_H_ 47 #endif // CC_LAYERS_VIDEO_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/video_frame_provider_client_impl.h ('k') | cc/layers/video_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698