diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp index 4312db8ae4a4..0fe8bff2834b 100644 --- a/content/html/content/src/nsHTMLMediaElement.cpp +++ b/content/html/content/src/nsHTMLMediaElement.cpp @@ -687,7 +687,6 @@ void nsHTMLMediaElement::ResumeLoad(PreloadAction aAction) mPreloadURI = nsnull; mPreloadAction = aAction; ChangeDelayLoadStatus(PR_TRUE); - mNetworkState = nsIDOMHTMLMediaElement::NETWORK_LOADING; if (mIsLoadingFromSrcAttribute) { // We were loading from the element's src attribute. if (NS_FAILED(LoadResource(uri))) { diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml index d0f5fed53bad..928f1eb573d4 100644 --- a/toolkit/content/widgets/videocontrols.xml +++ b/toolkit/content/widgets/videocontrols.xml @@ -310,13 +310,12 @@ setupStatusFader : function(immediate) { var show = false; if (this.video.seeking || this.video.error || - (this.video.networkState == this.video.NETWORK_LOADING && - (this.video.paused || this.video.ended - ? this.video.readyState < this.video.HAVE_CURRENT_DATA - : this.video.readyState < this.video.HAVE_FUTURE_DATA)) || + (this.video.paused || this.video.ended + ? this.video.readyState < this.video.HAVE_CURRENT_DATA + : this.video.readyState < this.video.HAVE_FUTURE_DATA) || (this.timeUpdateCount <= 1 && !this.video.ended && this.video.readyState < this.video.HAVE_ENOUGH_DATA && - this.video.networkState == this.video.NETWORK_LOADING)) + this.video.networkState >= this.video.NETWORK_LOADING)) show = true; this.log("Status overlay: seeking=" + this.video.seeking +