OLD | NEW |
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 CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
7 | 7 |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 // Getter method to |client_|. | 134 // Getter method to |client_|. |
135 blink::WebMediaPlayerClient* GetClient(); | 135 blink::WebMediaPlayerClient* GetClient(); |
136 | 136 |
137 blink::WebFrame* frame_; | 137 blink::WebFrame* frame_; |
138 | 138 |
139 blink::WebMediaPlayer::NetworkState network_state_; | 139 blink::WebMediaPlayer::NetworkState network_state_; |
140 blink::WebMediaPlayer::ReadyState ready_state_; | 140 blink::WebMediaPlayer::ReadyState ready_state_; |
141 | 141 |
142 blink::WebTimeRanges buffered_; | 142 blink::WebTimeRanges buffered_; |
143 | 143 |
| 144 float volume_; |
| 145 |
144 // Used for DCHECKs to ensure methods calls executed in the correct thread. | 146 // Used for DCHECKs to ensure methods calls executed in the correct thread. |
145 base::ThreadChecker thread_checker_; | 147 base::ThreadChecker thread_checker_; |
146 | 148 |
147 blink::WebMediaPlayerClient* client_; | 149 blink::WebMediaPlayerClient* client_; |
148 | 150 |
149 base::WeakPtr<WebMediaPlayerDelegate> delegate_; | 151 base::WeakPtr<WebMediaPlayerDelegate> delegate_; |
150 | 152 |
151 // Specify content:: to disambiguate from cc::. | 153 // Specify content:: to disambiguate from cc::. |
152 scoped_refptr<content::VideoFrameProvider> video_frame_provider_; | 154 scoped_refptr<content::VideoFrameProvider> video_frame_provider_; |
153 bool paused_; | 155 bool paused_; |
(...skipping 29 matching lines...) Expand all Loading... |
183 scoped_refptr<media::MediaLog> media_log_; | 185 scoped_refptr<media::MediaLog> media_log_; |
184 | 186 |
185 scoped_ptr<MediaStreamRendererFactory> renderer_factory_; | 187 scoped_ptr<MediaStreamRendererFactory> renderer_factory_; |
186 | 188 |
187 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); | 189 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); |
188 }; | 190 }; |
189 | 191 |
190 } // namespace content | 192 } // namespace content |
191 | 193 |
192 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 194 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
OLD | NEW |