Backed out 2 changesets (bug 1510569) for crashtests/1419902.html failures CLOSED TREE
Backed out changeset 13c5249d66a7 (bug 1510569) Backed out changeset a6ad4039d785 (bug 1510569)
This commit is contained in:
@@ -42,12 +42,6 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
|
||||
|
||||
this.onPageHide = this.onPageHide.bind(this);
|
||||
|
||||
this.isNavigating = false;
|
||||
|
||||
this._documentURI = null;
|
||||
this._characterSet = null;
|
||||
this._documentContentType = null;
|
||||
|
||||
/**
|
||||
* These are managed by the tabbrowser:
|
||||
*/
|
||||
@@ -358,16 +352,6 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
|
||||
return this.contentDocument ? this.contentDocument.contentType : null;
|
||||
}
|
||||
|
||||
set documentContentType(aContentType) {
|
||||
if (aContentType != null) {
|
||||
if (this.isRemoteBrowser) {
|
||||
this._documentContentType = aContentType;
|
||||
} else {
|
||||
this.contentDocument.documentContentType = aContentType;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
set sameProcessAsFrameLoader(val) {
|
||||
this._sameProcessAsFrameLoader = Cu.getWeakReference(val);
|
||||
}
|
||||
@@ -610,12 +594,6 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
|
||||
return this.isRemoteBrowser ? this._mayEnableCharacterEncodingMenu : this.docShell.mayEnableCharacterEncodingMenu;
|
||||
}
|
||||
|
||||
set mayEnableCharacterEncodingMenu(aMayEnable) {
|
||||
if (this.isRemoteBrowser) {
|
||||
this._mayEnableCharacterEncodingMenu = aMayEnable;
|
||||
}
|
||||
}
|
||||
|
||||
get contentPrincipal() {
|
||||
return this.isRemoteBrowser ? this._contentPrincipal : this.contentDocument.nodePrincipal;
|
||||
}
|
||||
@@ -781,11 +759,11 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
|
||||
|
||||
_wrapURIChangeCall(fn) {
|
||||
if (!this.isRemoteBrowser) {
|
||||
this.isNavigating = true;
|
||||
this.inLoadURI = true;
|
||||
try {
|
||||
fn();
|
||||
} finally {
|
||||
this.isNavigating = false;
|
||||
this.inLoadURI = false;
|
||||
}
|
||||
} else {
|
||||
fn();
|
||||
@@ -1044,7 +1022,7 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
|
||||
}
|
||||
|
||||
didStartLoadSinceLastUserTyping() {
|
||||
return !this.isNavigating &&
|
||||
return !this.inLoadURI &&
|
||||
this.urlbarChangeTracker._startedLoadSinceLastUserTyping;
|
||||
}
|
||||
|
||||
@@ -1392,22 +1370,6 @@ class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
|
||||
return this._remoteWebProgressManager;
|
||||
}
|
||||
|
||||
updateForStateChange(aCharset, aDocumentURI, aContentType) {
|
||||
if (this.isRemoteBrowser && this.messageManager) {
|
||||
if (aCharset != null) {
|
||||
this._characterSet = aCharset;
|
||||
}
|
||||
|
||||
if (aDocumentURI != null) {
|
||||
this._documentURI = aDocumentURI;
|
||||
}
|
||||
|
||||
if (aContentType != null) {
|
||||
this._documentContentType = aContentType;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
purgeSessionHistory() {
|
||||
if (this.isRemoteBrowser) {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user