зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1162639 - Make consistent how to handle MediaStreamURI r=roc
This commit is contained in:
Родитель
8afa085290
Коммит
1bf44ebad6
|
@ -878,7 +878,8 @@ void HTMLMediaElement::SelectResource()
|
|||
|
||||
mLoadingSrc = uri;
|
||||
UpdatePreloadAction();
|
||||
if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE) {
|
||||
if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE &&
|
||||
!IsMediaStreamURI(mLoadingSrc)) {
|
||||
// preload:none media, suspend the load here before we make any
|
||||
// network requests.
|
||||
SuspendLoad();
|
||||
|
@ -1016,7 +1017,8 @@ void HTMLMediaElement::LoadFromSourceChildren()
|
|||
NS_ASSERTION(mNetworkState == nsIDOMHTMLMediaElement::NETWORK_LOADING,
|
||||
"Network state should be loading");
|
||||
|
||||
if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE) {
|
||||
if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE &&
|
||||
!IsMediaStreamURI(mLoadingSrc)) {
|
||||
// preload:none media, suspend the load here before we make any
|
||||
// network requests.
|
||||
SuspendLoad();
|
||||
|
|
Загрузка…
Ссылка в новой задаче