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

Side by Side Diff: content/renderer/media/android/stream_texture_factory_impl.cc

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/renderer/media/android/stream_texture_factory_impl.h" 5 #include "content/renderer/media/android/stream_texture_factory_impl.h"
6 6
7 #include "cc/output/context_provider.h" 7 #include "cc/output/context_provider.h"
8 #include "content/common/gpu/client/gpu_channel_host.h" 8 #include "content/common/gpu/client/gpu_channel_host.h"
9 #include "content/common/gpu/gpu_messages.h" 9 #include "content/common/gpu/gpu_messages.h"
10 #include "content/renderer/gpu/stream_texture_host_android.h" 10 #include "content/renderer/gpu/stream_texture_host_android.h"
11 #include "gpu/command_buffer/client/gles2_interface.h" 11 #include "gpu/command_buffer/client/gles2_interface.h"
12 #include "ui/gfx/size.h" 12 #include "ui/gfx/size.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 namespace { 16 namespace {
17 17
18 class StreamTextureProxyImpl : public StreamTextureProxy, 18 class StreamTextureProxyImpl : public StreamTextureProxy,
19 public StreamTextureHost::Listener { 19 public StreamTextureHost::Listener {
20 public: 20 public:
21 explicit StreamTextureProxyImpl(StreamTextureHost* host); 21 explicit StreamTextureProxyImpl(StreamTextureHost* host);
22 virtual ~StreamTextureProxyImpl(); 22 virtual ~StreamTextureProxyImpl();
23 23
24 // StreamTextureProxy implementation: 24 // StreamTextureProxy implementation:
25 virtual void BindToLoop(int32 stream_id, 25 virtual void BindToLoop(int32 stream_id,
26 cc::VideoFrameProvider::Client* client, 26 cc::VideoFrameProvider::Client* client,
27 scoped_refptr<base::MessageLoopProxy> loop) OVERRIDE; 27 scoped_refptr<base::MessageLoopProxy> loop) override;
28 virtual void Release() OVERRIDE; 28 virtual void Release() override;
29 29
30 // StreamTextureHost::Listener implementation: 30 // StreamTextureHost::Listener implementation:
31 virtual void OnFrameAvailable() OVERRIDE; 31 virtual void OnFrameAvailable() override;
32 virtual void OnMatrixChanged(const float matrix[16]) OVERRIDE; 32 virtual void OnMatrixChanged(const float matrix[16]) override;
33 33
34 private: 34 private:
35 void BindOnThread(int32 stream_id); 35 void BindOnThread(int32 stream_id);
36 36
37 const scoped_ptr<StreamTextureHost> host_; 37 const scoped_ptr<StreamTextureHost> host_;
38 38
39 // Protects access to |client_| and |loop_|. 39 // Protects access to |client_| and |loop_|.
40 base::Lock lock_; 40 base::Lock lock_;
41 cc::VideoFrameProvider::Client* client_; 41 cc::VideoFrameProvider::Client* client_;
42 scoped_refptr<base::MessageLoopProxy> loop_; 42 scoped_refptr<base::MessageLoopProxy> loop_;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 void StreamTextureFactoryImpl::AddObserver( 168 void StreamTextureFactoryImpl::AddObserver(
169 StreamTextureFactoryContextObserver* obs) { 169 StreamTextureFactoryContextObserver* obs) {
170 } 170 }
171 171
172 void StreamTextureFactoryImpl::RemoveObserver( 172 void StreamTextureFactoryImpl::RemoveObserver(
173 StreamTextureFactoryContextObserver* obs) { 173 StreamTextureFactoryContextObserver* obs) {
174 } 174 }
175 175
176 } // namespace content 176 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698