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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Issue 2969093002: Make rendering of MediaStreams reflect changes to its set of tracks. (Closed)
Patch Set: Created 3 years, 5 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 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 MediaError* HTMLMediaElement::error() const { 773 MediaError* HTMLMediaElement::error() const {
774 return error_; 774 return error_;
775 } 775 }
776 776
777 void HTMLMediaElement::SetSrc(const AtomicString& url) { 777 void HTMLMediaElement::SetSrc(const AtomicString& url) {
778 setAttribute(srcAttr, url); 778 setAttribute(srcAttr, url);
779 } 779 }
780 780
781 void HTMLMediaElement::SetSrcObject(MediaStreamDescriptor* src_object) { 781 void HTMLMediaElement::SetSrcObject(MediaStreamDescriptor* src_object) {
782 BLINK_MEDIA_LOG << "setSrcObject(" << (void*)this << ")"; 782 BLINK_MEDIA_LOG << "setSrcObject(" << (void*)this << ")";
783 if (src_object_ == src_object)
foolip 2017/07/05 08:49:44 https://html.spec.whatwg.org/multipage/media.html#
Guido Urdaneta 2017/07/05 13:05:02 Reverted the change and added a test to make sure
foolip 2017/07/05 13:13:52 Great!
784 return;
785
783 src_object_ = src_object; 786 src_object_ = src_object;
784 InvokeLoadAlgorithm(); 787 InvokeLoadAlgorithm();
785 } 788 }
786 789
787 HTMLMediaElement::NetworkState HTMLMediaElement::getNetworkState() const { 790 HTMLMediaElement::NetworkState HTMLMediaElement::getNetworkState() const {
788 return network_state_; 791 return network_state_;
789 } 792 }
790 793
791 String HTMLMediaElement::canPlayType(const String& mime_type) const { 794 String HTMLMediaElement::canPlayType(const String& mime_type) const {
792 MIMETypeRegistry::SupportsType support = 795 MIMETypeRegistry::SupportsType support =
(...skipping 3333 matching lines...) Expand 10 before | Expand all | Expand 10 after
4126 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); 4129 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE);
4127 } 4130 }
4128 4131
4129 void HTMLMediaElement::ViewportFillDebouncerTimerFired(TimerBase*) { 4132 void HTMLMediaElement::ViewportFillDebouncerTimerFired(TimerBase*) {
4130 mostly_filling_viewport_ = true; 4133 mostly_filling_viewport_ = true;
4131 if (web_media_player_) 4134 if (web_media_player_)
4132 web_media_player_->BecameDominantVisibleContent(mostly_filling_viewport_); 4135 web_media_player_->BecameDominantVisibleContent(mostly_filling_viewport_);
4133 } 4136 }
4134 4137
4135 } // namespace blink 4138 } // namespace blink
OLDNEW
« content/test/data/media/getusermedia.html ('K') | « content/test/data/media/getusermedia.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698