| 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 | |
| 137 virtual bool didLoadingProgress() const; | |
| 138 virtual bool didLoadingProgress(); | 135 virtual bool didLoadingProgress(); |
| 139 | 136 |
| 140 // Internal states of loading and network. | 137 // Internal states of loading and network. |
| 141 virtual blink::WebMediaPlayer::NetworkState networkState() const; | 138 virtual blink::WebMediaPlayer::NetworkState networkState() const; |
| 142 virtual blink::WebMediaPlayer::ReadyState readyState() const; | 139 virtual blink::WebMediaPlayer::ReadyState readyState() const; |
| 143 | 140 |
| 144 virtual bool hasSingleSecurityOrigin() const; | 141 virtual bool hasSingleSecurityOrigin() const; |
| 145 virtual bool didPassCORSAccessCheck() const; | 142 virtual bool didPassCORSAccessCheck() const; |
| 146 | 143 |
| 147 virtual double mediaTimeForTimeValue(double timeValue) const; | 144 virtual double mediaTimeForTimeValue(double timeValue) const; |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 | 444 |
| 448 // NOTE: Weak pointers must be invalidated before all other member variables. | 445 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 449 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 446 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 450 | 447 |
| 451 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 448 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 452 }; | 449 }; |
| 453 | 450 |
| 454 } // namespace content | 451 } // namespace content |
| 455 | 452 |
| 456 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 453 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |