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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 // Dimensions of the video. | 125 // Dimensions of the video. |
| 126 virtual blink::WebSize naturalSize() const; | 126 virtual blink::WebSize naturalSize() const; |
| 127 | 127 |
| 128 // Getters of playback state. | 128 // Getters of playback state. |
| 129 virtual bool paused() const; | 129 virtual bool paused() const; |
| 130 virtual bool seeking() const; | 130 virtual bool seeking() const; |
| 131 virtual double duration() const; | 131 virtual double duration() const; |
| 132 virtual double timelineOffset() const; | 132 virtual double timelineOffset() const; |
| 133 virtual double currentTime() const; | 133 virtual double currentTime() const; |
| 134 | 134 |
| 135 // TODO(sandersd): Remove const version. | |
| 136 // http://crbug.com/360251 | |
| 135 virtual bool didLoadingProgress() const; | 137 virtual bool didLoadingProgress() const; |
| 138 virtual bool didLoadingProgress(); | |
| 136 | 139 |
| 137 // Internal states of loading and network. | 140 // Internal states of loading and network. |
| 138 virtual blink::WebMediaPlayer::NetworkState networkState() const; | 141 virtual blink::WebMediaPlayer::NetworkState networkState() const; |
| 139 virtual blink::WebMediaPlayer::ReadyState readyState() const; | 142 virtual blink::WebMediaPlayer::ReadyState readyState() const; |
| 140 | 143 |
| 141 virtual bool hasSingleSecurityOrigin() const; | 144 virtual bool hasSingleSecurityOrigin() const; |
| 142 virtual bool didPassCORSAccessCheck() const; | 145 virtual bool didPassCORSAccessCheck() const; |
| 143 | 146 |
| 144 virtual double mediaTimeForTimeValue(double timeValue) const; | 147 virtual double mediaTimeForTimeValue(double timeValue) const; |
| 145 | 148 |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 324 // Seek gets pending if another seek is in progress. Only last pending seek | 327 // Seek gets pending if another seek is in progress. Only last pending seek |
| 325 // will have effect. | 328 // will have effect. |
| 326 bool pending_seek_; | 329 bool pending_seek_; |
| 327 base::TimeDelta pending_seek_time_; | 330 base::TimeDelta pending_seek_time_; |
| 328 | 331 |
| 329 // Internal seek state. | 332 // Internal seek state. |
| 330 bool seeking_; | 333 bool seeking_; |
| 331 base::TimeDelta seek_time_; | 334 base::TimeDelta seek_time_; |
| 332 | 335 |
| 333 // Whether loading has progressed since the last call to didLoadingProgress. | 336 // Whether loading has progressed since the last call to didLoadingProgress. |
| 334 mutable bool did_loading_progress_; | 337 mutable bool did_loading_progress_; |
|
scherkus (not reviewing)
2014/05/09 22:39:18
I think we can have this CL remove all the mutable
scherkus (not reviewing)
2014/05/09 22:40:21
(doing it this way accomplishes the real goal of g
sandersd (OOO until July 31)
2014/05/09 23:05:56
Sure, I had that planned for the third CL, but I s
| |
| 335 | 338 |
| 336 // Manager for managing this object and for delegating method calls on | 339 // Manager for managing this object and for delegating method calls on |
| 337 // Render Thread. | 340 // Render Thread. |
| 338 RendererMediaPlayerManager* manager_; | 341 RendererMediaPlayerManager* manager_; |
| 339 | 342 |
| 340 // Player ID assigned by the |manager_|. | 343 // Player ID assigned by the |manager_|. |
| 341 int player_id_; | 344 int player_id_; |
| 342 | 345 |
| 343 // Current player states. | 346 // Current player states. |
| 344 blink::WebMediaPlayer::NetworkState network_state_; | 347 blink::WebMediaPlayer::NetworkState network_state_; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 444 | 447 |
| 445 // NOTE: Weak pointers must be invalidated before all other member variables. | 448 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 446 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 449 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 447 | 450 |
| 448 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 451 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 449 }; | 452 }; |
| 450 | 453 |
| 451 } // namespace content | 454 } // namespace content |
| 452 | 455 |
| 453 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 456 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |