Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Side by Side Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 2660003003: Add MediaError.message (Closed)
Patch Set: --flakiness by using std::map, update virtual/stable/[win,mac] global interface listing too Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 DCHECK(thread_checker_.CalledOnValidThread()); 415 DCHECK(thread_checker_.CalledOnValidThread());
416 return network_state_; 416 return network_state_;
417 } 417 }
418 418
419 blink::WebMediaPlayer::ReadyState WebMediaPlayerMS::GetReadyState() const { 419 blink::WebMediaPlayer::ReadyState WebMediaPlayerMS::GetReadyState() const {
420 DVLOG(1) << __func__ << ", state:" << ready_state_; 420 DVLOG(1) << __func__ << ", state:" << ready_state_;
421 DCHECK(thread_checker_.CalledOnValidThread()); 421 DCHECK(thread_checker_.CalledOnValidThread());
422 return ready_state_; 422 return ready_state_;
423 } 423 }
424 424
425 blink::WebString WebMediaPlayerMS::GetErrorMessage() { 425 std::map<std::string, std::vector<std::string>>
426 return blink::WebString::FromUTF8(media_log_->GetLastErrorMessage()); 426 WebMediaPlayerMS::GetErrorMessages() const {
427 return media_log_->GetErrorMessages();
427 } 428 }
428 429
429 blink::WebTimeRanges WebMediaPlayerMS::Buffered() const { 430 blink::WebTimeRanges WebMediaPlayerMS::Buffered() const {
430 DCHECK(thread_checker_.CalledOnValidThread()); 431 DCHECK(thread_checker_.CalledOnValidThread());
431 return buffered_; 432 return buffered_;
432 } 433 }
433 434
434 blink::WebTimeRanges WebMediaPlayerMS::Seekable() const { 435 blink::WebTimeRanges WebMediaPlayerMS::Seekable() const {
435 DCHECK(thread_checker_.CalledOnValidThread()); 436 DCHECK(thread_checker_.CalledOnValidThread());
436 return blink::WebTimeRanges(); 437 return blink::WebTimeRanges();
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 void WebMediaPlayerMS::ResetCanvasCache() { 704 void WebMediaPlayerMS::ResetCanvasCache() {
704 DCHECK(thread_checker_.CalledOnValidThread()); 705 DCHECK(thread_checker_.CalledOnValidThread());
705 video_renderer_.ResetCache(); 706 video_renderer_.ResetCache();
706 } 707 }
707 708
708 void WebMediaPlayerMS::TriggerResize() { 709 void WebMediaPlayerMS::TriggerResize() {
709 get_client()->SizeChanged(); 710 get_client()->SizeChanged();
710 } 711 }
711 712
712 } // namespace content 713 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698