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

Side by Side Diff: cc/layers/video_frame_provider_client_impl.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/ui_resource_layer_impl.h ('k') | cc/layers/video_layer.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_PROVIDER_CLIENT_IMPL_H_ 5 #ifndef CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
6 #define CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_ 6 #define CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "cc/layers/video_frame_provider.h" 10 #include "cc/layers/video_frame_provider.h"
(...skipping 21 matching lines...) Expand all
32 32
33 scoped_refptr<media::VideoFrame> AcquireLockAndCurrentFrame(); 33 scoped_refptr<media::VideoFrame> AcquireLockAndCurrentFrame();
34 void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame); 34 void PutCurrentFrame(const scoped_refptr<media::VideoFrame>& frame);
35 void ReleaseLock(); 35 void ReleaseLock();
36 const gfx::Transform& stream_texture_matrix() const { 36 const gfx::Transform& stream_texture_matrix() const {
37 return stream_texture_matrix_; 37 return stream_texture_matrix_;
38 } 38 }
39 39
40 // VideoFrameProvider::Client implementation. These methods are all callable 40 // VideoFrameProvider::Client implementation. These methods are all callable
41 // on any thread. 41 // on any thread.
42 virtual void StopUsingProvider() OVERRIDE; 42 virtual void StopUsingProvider() override;
43 virtual void DidReceiveFrame() OVERRIDE; 43 virtual void DidReceiveFrame() override;
44 virtual void DidUpdateMatrix(const float* matrix) OVERRIDE; 44 virtual void DidUpdateMatrix(const float* matrix) override;
45 45
46 private: 46 private:
47 explicit VideoFrameProviderClientImpl(VideoFrameProvider* provider); 47 explicit VideoFrameProviderClientImpl(VideoFrameProvider* provider);
48 friend class base::RefCounted<VideoFrameProviderClientImpl>; 48 friend class base::RefCounted<VideoFrameProviderClientImpl>;
49 virtual ~VideoFrameProviderClientImpl(); 49 virtual ~VideoFrameProviderClientImpl();
50 50
51 VideoLayerImpl* active_video_layer_; 51 VideoLayerImpl* active_video_layer_;
52 52
53 // Guards the destruction of provider_ and the frame that it provides 53 // Guards the destruction of provider_ and the frame that it provides
54 base::Lock provider_lock_; 54 base::Lock provider_lock_;
55 VideoFrameProvider* provider_; 55 VideoFrameProvider* provider_;
56 56
57 gfx::Transform stream_texture_matrix_; 57 gfx::Transform stream_texture_matrix_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(VideoFrameProviderClientImpl); 59 DISALLOW_COPY_AND_ASSIGN(VideoFrameProviderClientImpl);
60 }; 60 };
61 61
62 } // namespace cc 62 } // namespace cc
63 63
64 #endif // CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_ 64 #endif // CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « cc/layers/ui_resource_layer_impl.h ('k') | cc/layers/video_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698