| 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 #include "content/renderer/media/webmediaplayer_ms.h" | 5 #include "content/renderer/media/webmediaplayer_ms.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 DCHECK(thread_checker_.CalledOnValidThread()); | 292 DCHECK(thread_checker_.CalledOnValidThread()); |
| 293 return network_state_; | 293 return network_state_; |
| 294 } | 294 } |
| 295 | 295 |
| 296 blink::WebMediaPlayer::ReadyState WebMediaPlayerMS::getReadyState() const { | 296 blink::WebMediaPlayer::ReadyState WebMediaPlayerMS::getReadyState() const { |
| 297 DVLOG(1) << __FUNCTION__ << ", state:" << ready_state_; | 297 DVLOG(1) << __FUNCTION__ << ", state:" << ready_state_; |
| 298 DCHECK(thread_checker_.CalledOnValidThread()); | 298 DCHECK(thread_checker_.CalledOnValidThread()); |
| 299 return ready_state_; | 299 return ready_state_; |
| 300 } | 300 } |
| 301 | 301 |
| 302 blink::WebString WebMediaPlayerMS::getErrorMessage() { |
| 303 return blink::WebString::fromUTF8(media_log_->GetLastErrorMessage()); |
| 304 } |
| 305 |
| 302 blink::WebTimeRanges WebMediaPlayerMS::buffered() const { | 306 blink::WebTimeRanges WebMediaPlayerMS::buffered() const { |
| 303 DCHECK(thread_checker_.CalledOnValidThread()); | 307 DCHECK(thread_checker_.CalledOnValidThread()); |
| 304 return buffered_; | 308 return buffered_; |
| 305 } | 309 } |
| 306 | 310 |
| 307 blink::WebTimeRanges WebMediaPlayerMS::seekable() const { | 311 blink::WebTimeRanges WebMediaPlayerMS::seekable() const { |
| 308 DCHECK(thread_checker_.CalledOnValidThread()); | 312 DCHECK(thread_checker_.CalledOnValidThread()); |
| 309 return blink::WebTimeRanges(); | 313 return blink::WebTimeRanges(); |
| 310 } | 314 } |
| 311 | 315 |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 media::SkCanvasVideoRenderer* WebMediaPlayerMS::GetSkCanvasVideoRenderer() { | 533 media::SkCanvasVideoRenderer* WebMediaPlayerMS::GetSkCanvasVideoRenderer() { |
| 530 return &video_renderer_; | 534 return &video_renderer_; |
| 531 } | 535 } |
| 532 | 536 |
| 533 void WebMediaPlayerMS::ResetCanvasCache() { | 537 void WebMediaPlayerMS::ResetCanvasCache() { |
| 534 DCHECK(thread_checker_.CalledOnValidThread()); | 538 DCHECK(thread_checker_.CalledOnValidThread()); |
| 535 video_renderer_.ResetCache(); | 539 video_renderer_.ResetCache(); |
| 536 } | 540 } |
| 537 | 541 |
| 538 } // namespace content | 542 } // namespace content |
| OLD | NEW |