Chromium Code Reviews| 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 MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 279 double playback_rate_; | 279 double playback_rate_; |
| 280 base::TimeDelta paused_time_; | 280 base::TimeDelta paused_time_; |
| 281 | 281 |
| 282 // TODO(scherkus): Replace with an explicit ended signal to HTMLMediaElement, | 282 // TODO(scherkus): Replace with an explicit ended signal to HTMLMediaElement, |
| 283 // see http://crbug.com/409280 | 283 // see http://crbug.com/409280 |
| 284 bool ended_; | 284 bool ended_; |
| 285 | 285 |
| 286 // Seek gets pending if another seek is in progress. Only last pending seek | 286 // Seek gets pending if another seek is in progress. Only last pending seek |
| 287 // will have effect. | 287 // will have effect. |
| 288 bool pending_seek_; | 288 bool pending_seek_; |
| 289 double pending_seek_seconds_; | 289 base::TimeDelta pending_seek_time_; |
| 290 base::TimeDelta seek_time_; | |
|
xhwang
2015/06/09 21:33:57
Move |seek_time_| to after |seeking_|?
wolenetz
2015/06/09 22:09:58
Done, with comments added, and |playback_rate_| mo
| |
| 290 | 291 |
| 291 // Tracks whether to issue time changed notifications during buffering state | 292 // Tracks whether to issue time changed notifications during buffering state |
| 292 // changes. | 293 // changes. |
| 293 bool should_notify_time_changed_; | 294 bool should_notify_time_changed_; |
| 294 | 295 |
| 295 blink::WebMediaPlayerClient* client_; | 296 blink::WebMediaPlayerClient* client_; |
| 296 | 297 |
| 297 base::WeakPtr<WebMediaPlayerDelegate> delegate_; | 298 base::WeakPtr<WebMediaPlayerDelegate> delegate_; |
| 298 | 299 |
| 299 WebMediaPlayerParams::DeferLoadCB defer_load_cb_; | 300 WebMediaPlayerParams::DeferLoadCB defer_load_cb_; |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 328 EncryptedMediaPlayerSupport encrypted_media_support_; | 329 EncryptedMediaPlayerSupport encrypted_media_support_; |
| 329 | 330 |
| 330 scoped_ptr<RendererFactory> renderer_factory_; | 331 scoped_ptr<RendererFactory> renderer_factory_; |
| 331 | 332 |
| 332 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 333 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
| 333 }; | 334 }; |
| 334 | 335 |
| 335 } // namespace media | 336 } // namespace media |
| 336 | 337 |
| 337 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 338 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| OLD | NEW |