Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit backout of f88258e1ddbe

Browse Source
This commit is contained in:
Chris Pearce 2010-08-18 13:57:52 +12:00
commit b42c8d17a9
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/html/content/src/nsHTMLMediaElement.cpp
View File

@ -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))) {

9
toolkit/content/widgets/videocontrols.xml
View File

@ -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 +