Bug 1443371 - Remove unused View Source message listeners. r=bdahl

After bug 1418403, there are some left over message listeners in View Source
that are unused.

MozReview-Commit-ID: v5WACzJEA6
This commit is contained in:
J. Ryan Stinnett
2018-03-06 08:06:25 -06:00
parent 476acd67e2
commit 779ef16ae3

View File

@@ -37,12 +37,8 @@ var ViewSourceContent = {
*/
messages: [
"ViewSource:LoadSource",
"ViewSource:LoadSourceDeprecated",
"ViewSource:LoadSourceWithSelection",
"ViewSource:GoToLine",
"ViewSource:ToggleWrapping",
"ViewSource:ToggleSyntaxHighlighting",
"ViewSource:SetCharacterSet",
],
/**
@@ -104,31 +100,17 @@ var ViewSourceContent = {
return;
}
let data = msg.data;
let objects = msg.objects;
switch (msg.name) {
case "ViewSource:LoadSource":
this.viewSource(data.URL, data.outerWindowID, data.lineNumber,
data.shouldWrap);
break;
case "ViewSource:LoadSourceDeprecated":
this.viewSourceDeprecated(data.URL, objects.pageDescriptor, data.lineNumber,
data.forcedCharSet);
break;
case "ViewSource:LoadSourceWithSelection":
this.viewSourceWithSelection(data.URL, data.drawSelection, data.baseURI);
break;
case "ViewSource:GoToLine":
this.goToLine(data.lineNumber);
break;
case "ViewSource:ToggleWrapping":
this.toggleWrapping();
break;
case "ViewSource:ToggleSyntaxHighlighting":
this.toggleSyntaxHighlighting();
break;
case "ViewSource:SetCharacterSet":
this.setCharacterSet(data.charset, data.doPageLoad);
break;
}
},
@@ -223,33 +205,6 @@ var ViewSourceContent = {
this.loadSource(URL, pageDescriptor, lineNumber, forcedCharSet);
},
/**
* Called when the parent is using the deprecated API for viewSource.xul.
* This function will throw if it's called on a remote browser.
*
* @param URL (required)
* The URL string of the source to be shown.
* @param pageDescriptor (optional)
* The currentDescriptor off of an nsIWebPageDescriptor, in the
* event that the caller wants to try to load the source out of
* the network cache.
* @param lineNumber (optional)
* The line number to focus as soon as the source has finished
* loading.
* @param forcedCharSet (optional)
* The document character set to use instead of the default one.
*/
viewSourceDeprecated(URL, pageDescriptor, lineNumber, forcedCharSet) {
// This should not be called if this frame script is running
// in a content process!
if (Services.appinfo.processType != Services.appinfo.PROCESS_TYPE_DEFAULT) {
throw new Error("ViewSource deprecated API should not be used with " +
"remote browsers.");
}
this.loadSource(URL, pageDescriptor, lineNumber, forcedCharSet);
},
/**
* Common utility function used by both the current and deprecated APIs
* for loading source.
@@ -634,37 +589,6 @@ var ViewSourceContent = {
sendAsyncMessage("ViewSource:StoreSyntaxHighlighting", { state });
},
/**
* Called when the parent has changed the character set to view the
* source with.
*
* @param charset
* The character set to use.
* @param doPageLoad
* Whether or not we should reload the page ourselves with the
* nsIWebPageDescriptor. Part of a workaround for bug 136322.
*/
setCharacterSet(charset, doPageLoad) {
docShell.charset = charset;
if (doPageLoad) {
this.reload();
}
},
/**
* Reloads the content.
*/
reload() {
let pageLoader = docShell.QueryInterface(Ci.nsIWebPageDescriptor);
try {
pageLoader.loadPage(pageLoader.currentDescriptor,
Ci.nsIWebPageDescriptor.DISPLAY_NORMAL);
} catch (e) {
let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
webNav.reload(Ci.nsIWebNavigation.LOAD_FLAGS_NONE);
}
},
/**
* Loads a view source selection showing the given view-source url and
* highlight the selection.