Bug 782684 - charsetLoadListener needs no event argument. r=gavin
authorDão Gottwald <dao@mozilla.com>
Tue, 21 Aug 2012 09:54:57 +0200
changeset 102917 613bc459e292c2eb84546512b01171ed63e7991d
parent 102904 f9a8fdb081936577a38d596b3514f1a78a0c17a0
child 102918 62d00e115522f1eb685884483bb60a0c446d5473
push id23317
push userryanvm@gmail.com
push dateWed, 22 Aug 2012 02:05:02 +0000
treeherdermozilla-central@abc17059522b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs782684
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 782684 - charsetLoadListener needs no event argument. r=gavin
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -216,17 +216,17 @@ XPCOMUtils.defineLazyGetter(this, "PageM
 
 /**
 * We can avoid adding multiple load event listeners and save some time by adding
 * one listener that calls all real handlers.
 */
 function pageShowEventHandlers(event) {
   // Filter out events that are not about the document load we are interested in
   if (event.target == content.document) {
-    charsetLoadListener(event);
+    charsetLoadListener();
     XULBrowserWindow.asyncUpdateUI();
 
     // The PluginClickToPlay events are not fired when navigating using the
     // BF cache. |event.persisted| is true when the page is loaded from the
     // BF cache, so this code reshows the notification if necessary.
     if (event.persisted)
       gPluginHandler.reshowClickToPlayNotification();
   }
@@ -5492,17 +5492,17 @@ function UpdateMenus(event) {
   UpdateCurrentCharset(event.target);
   UpdateCharsetDetector(event.target);
 }
 
 function CreateMenu(node) {
   Services.obs.notifyObservers(null, "charsetmenu-selected", node);
 }
 
-function charsetLoadListener(event) {
+function charsetLoadListener() {
   var charset = window.content.document.characterSet;
 
   if (charset.length > 0 && (charset != gLastBrowserCharset)) {
     if (!gCharsetMenu)
       gCharsetMenu = Cc['@mozilla.org/rdf/datasource;1?name=charset-menu'].getService(Ci.nsICurrentCharsetListener);
     gCharsetMenu.SetCurrentCharset(charset);
     gPrevCharset = gLastBrowserCharset;
     gLastBrowserCharset = charset;