| 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_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ | 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 virtual double duration() const; | 108 virtual double duration() const; |
| 109 virtual double timelineOffset() const; | 109 virtual double timelineOffset() const; |
| 110 virtual double currentTime() const; | 110 virtual double currentTime() const; |
| 111 | 111 |
| 112 // Internal states of loading and network. | 112 // Internal states of loading and network. |
| 113 // TODO(hclam): Ask the pipeline about the state rather than having reading | 113 // TODO(hclam): Ask the pipeline about the state rather than having reading |
| 114 // them from members which would cause race conditions. | 114 // them from members which would cause race conditions. |
| 115 virtual blink::WebMediaPlayer::NetworkState networkState() const; | 115 virtual blink::WebMediaPlayer::NetworkState networkState() const; |
| 116 virtual blink::WebMediaPlayer::ReadyState readyState() const; | 116 virtual blink::WebMediaPlayer::ReadyState readyState() const; |
| 117 | 117 |
| 118 // TODO(sandersd): Remove const version. | |
| 119 // http://crbug.com/360251 | |
| 120 virtual bool didLoadingProgress() const; | |
| 121 virtual bool didLoadingProgress(); | 118 virtual bool didLoadingProgress(); |
| 122 | 119 |
| 123 virtual bool hasSingleSecurityOrigin() const; | 120 virtual bool hasSingleSecurityOrigin() const; |
| 124 virtual bool didPassCORSAccessCheck() const; | 121 virtual bool didPassCORSAccessCheck() const; |
| 125 | 122 |
| 126 virtual double mediaTimeForTimeValue(double timeValue) const; | 123 virtual double mediaTimeForTimeValue(double timeValue) const; |
| 127 | 124 |
| 128 virtual unsigned decodedFrameCount() const; | 125 virtual unsigned decodedFrameCount() const; |
| 129 virtual unsigned droppedFrameCount() const; | 126 virtual unsigned droppedFrameCount() const; |
| 130 virtual unsigned audioDecodedByteCount() const; | 127 virtual unsigned audioDecodedByteCount() const; |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 WebContentDecryptionModuleImpl* web_cdm_; | 353 WebContentDecryptionModuleImpl* web_cdm_; |
| 357 | 354 |
| 358 media::DecryptorReadyCB decryptor_ready_cb_; | 355 media::DecryptorReadyCB decryptor_ready_cb_; |
| 359 | 356 |
| 360 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 357 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
| 361 }; | 358 }; |
| 362 | 359 |
| 363 } // namespace content | 360 } // namespace content |
| 364 | 361 |
| 365 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ | 362 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ |
| OLD | NEW |