Bug 517755 - use smart getters in View Source window. r=neil
authorDão Gottwald <dao@mozilla.com>
Sat, 03 Oct 2009 11:36:04 +0200
changeset 33423 0a7dd88dbe676f5e36efb4fbceec13fe3666a8c2
parent 33422 a6e6be273c6dac4cf9ea1b71f1bdff7b6cfe2b56
child 33424 0c145a6507a37eff50918a0a1d683642741249e7
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil
bugs517755
milestone1.9.3a1pre
Bug 517755 - use smart getters in View Source window. r=neil
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js
toolkit/components/viewsource/content/viewPartialSource.js
toolkit/components/viewsource/content/viewSource.js
toolkit/components/viewsource/content/viewSource.xul
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js
@@ -56,17 +56,17 @@ function test() {
       observe: function(aSubject, aTopic, aData) {
         if (aTopic == "domwindowopened") {
           ww.unregisterNotification(this);
 
           let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
           win.addEventListener("load", function() {
             win.removeEventListener("load", arguments.callee, false);
 
-            let browser = win.getBrowser();
+            let browser = win.gBrowser;
             browser.addEventListener("load", function() {
               browser.removeEventListener("load", arguments.callee, true);
               
               // view source window is loaded, proceed with the rest of the test
               step1();
             }, true);
           }, false);
         }
@@ -163,17 +163,17 @@ function test() {
             ok(true, "Leaving the private browsing mode should restore the previous view source window");
             if (++events == 2)
               ww.unregisterNotification(observer);
 
             let win = aSubject.QueryInterface(Ci.nsIDOMEventTarget);
             win.addEventListener("load", function() {
               win.removeEventListener("load", arguments.callee, false);
 
-              let browser = win.getBrowser();
+              let browser = win.gBrowser;
               browser.addEventListener("load", function() {
                 browser.removeEventListener("load", arguments.callee, true);
                 
                 is(win.content.location.href, "view-source:about:",
                   "The correct view source window should be restored");
 
                 // cleanup
                 win.close();
--- a/toolkit/components/viewsource/content/viewPartialSource.js
+++ b/toolkit/components/viewsource/content/viewPartialSource.js
@@ -196,19 +196,19 @@ function viewPartialSourceForSelection(s
   // the load is aynchronous and so we will wait until the view-source DOM is done
   // before drawing the selection.
   if (canDrawSelection) {
     window.document.getElementById("content").addEventListener("load", drawSelection, true);
   }
 
   // all our content is held by the data:URI and URIs are internally stored as utf-8 (see nsIURI.idl)
   var loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE;
-  getBrowser().webNavigation
-              .loadURI("view-source:data:text/html;charset=utf-8," + encodeURIComponent(tmpNode.innerHTML),
-                       loadFlags, null, null, null);
+  getWebNavigation().loadURI("view-source:data:text/html;charset=utf-8,"
+                             + encodeURIComponent(tmpNode.innerHTML),
+                             loadFlags, null, null, null);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // helper to get a path like FIXptr, but with an array instead of the "tumbler" notation
 // see FIXptr: http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm
 function getPath(ancestor, node)
 {
   var n = node;
@@ -232,18 +232,18 @@ function getPath(ancestor, node)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // using special markers left in the serialized source, this helper makes the
 // underlying markup of the selected fragment to automatically appear as selected
 // on the inflated view-source DOM
 function drawSelection()
 {
-  getBrowser().contentDocument.title =
-    getViewSourceBundle().getString("viewSelectionSourceTitle");
+  gBrowser.contentDocument.title =
+    gViewSourceBundle.getString("viewSelectionSourceTitle");
 
   // find the special selection markers that we added earlier, and
   // draw the selection between the two...
   var findService = null;
   try {
     // get the find service which stores the global find state
     findService = Components.classes["@mozilla.org/find/find_service;1"]
                             .getService(Components.interfaces.nsIFindService);
@@ -255,29 +255,28 @@ function drawSelection()
   var matchCase     = findService.matchCase;
   var entireWord    = findService.entireWord;
   var wrapFind      = findService.wrapFind;
   var findBackwards = findService.findBackwards;
   var searchString  = findService.searchString;
   var replaceString = findService.replaceString;
 
   // setup our find instance
-  var findInst = getBrowser().webBrowserFind;
+  var findInst = gBrowser.webBrowserFind;
   findInst.matchCase = true;
   findInst.entireWord = false;
   findInst.wrapFind = true;
   findInst.findBackwards = false;
 
   // ...lookup the start mark
   findInst.searchString = MARK_SELECTION_START;
   var startLength = MARK_SELECTION_START.length;
   findInst.findNext();
 
-  var contentWindow = getBrowser().contentDocument.defaultView;
-  var selection = contentWindow.getSelection();
+  var selection = content.getSelection();
   var range = selection.getRangeAt(0);
 
   var startContainer = range.startContainer;
   var startOffset = range.startOffset;
 
   // ...lookup the end mark
   findInst.searchString = MARK_SELECTION_END;
   var endLength = MARK_SELECTION_END.length;
@@ -297,23 +296,20 @@ function drawSelection()
   range.setEnd(endContainer, endOffset);
 
   // show the selection and scroll it into view
   selection.addRange(range);
   // the default behavior of the selection is to scroll at the end of
   // the selection, whereas in this situation, it is more user-friendly
   // to scroll at the beginning. So we override the default behavior here
   try {
-    getBrowser().docShell
-                .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                .getInterface(Components.interfaces.nsISelectionDisplay)
-                .QueryInterface(Components.interfaces.nsISelectionController)
-                .scrollSelectionIntoView(Components.interfaces.nsISelectionController.SELECTION_NORMAL,
-                                         Components.interfaces.nsISelectionController.SELECTION_ANCHOR_REGION,
-                                         true);
+    getSelectionController().scrollSelectionIntoView(
+                               Ci.nsISelectionController.SELECTION_NORMAL,
+                               Ci.nsISelectionController.SELECTION_ANCHOR_REGION,
+                               true);
   }
   catch(e) { }
 
   // restore the current find state
   findService.matchCase     = matchCase;
   findService.entireWord    = entireWord;
   findService.wrapFind      = wrapFind;
   findService.findBackwards = findBackwards;
@@ -344,17 +340,17 @@ function viewPartialSourceForFragment(no
     throw 'not reached';
   var topNode = gTargetNode;
   while (topNode && topNode.localName != topTag)
     topNode = topNode.parentNode;
   if (!topNode)
     return;
 
   // serialize
-  var title = getViewSourceBundle().getString("viewMathMLSourceTitle");
+  var title = gViewSourceBundle.getString("viewMathMLSourceTitle");
   var wrapClass = gWrapLongLines ? ' class="wrap"' : '';
   var source =
     '<!DOCTYPE html>'
   + '<html>'
   + '<head><title>' + title + '</title>'
   + '<link rel="stylesheet" type="text/css" href="' + gViewSourceCSS + '">'
   + '<style type="text/css">'
   + '#target { border: dashed 1px; background-color: lightyellow; }'
@@ -363,17 +359,17 @@ function viewPartialSourceForFragment(no
   + '<body id="viewsource"' + wrapClass
   +        ' onload="document.title=\''+title+'\';document.getElementById(\'target\').scrollIntoView(true)">'
   + '<pre>'
   + getOuterMarkup(topNode, 0)
   + '</pre></body></html>'
   ; // end
 
   // display
-  getBrowser().loadURI("data:text/html;charset=utf-8," + encodeURIComponent(source));
+  gBrowser.loadURI("data:text/html;charset=utf-8," + encodeURIComponent(source));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 function getInnerMarkup(node, indent) {
   var str = '';
   for (var i = 0; i < node.childNodes.length; i++) {
     str += getOuterMarkup(node.childNodes.item(i), indent);
   }
--- a/toolkit/components/viewsource/content/viewSource.js
+++ b/toolkit/components/viewsource/content/viewSource.js
@@ -17,16 +17,17 @@
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Doron Rosenberg (doronr@naboonline.com)
 #   Neil Rashbrook (neil@parkwaycc.co.uk)
+#   Dão Gottwald (dao@design-noir.de)
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
@@ -34,27 +35,47 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cr = Components.results;
-const pageLoaderIface = Components.interfaces.nsIWebPageDescriptor;
-const nsISelectionPrivate = Components.interfaces.nsISelectionPrivate;
-const nsISelectionController = Components.interfaces.nsISelectionController;
-var gBrowser = null;
-var gViewSourceBundle = null;
 var gPrefs = null;
 
 var gLastLineFound = '';
 var gGoToLine = 0;
 
+[
+  ["gBrowser",          "content"],
+  ["gViewSourceBundle", "viewSourceBundle"]
+].forEach(function ([name, id]) {
+  window.__defineGetter__(name, function () {
+    var element = document.getElementById(id);
+    if (!element)
+      return null;
+    delete window[name];
+    return window[name] = element;
+  });
+});
+
+// viewZoomOverlay.js uses this
+function getBrowser() {
+  return gBrowser;
+}
+
+__defineGetter__("gPageLoader", function () {
+  var webnav = getWebNavigation();
+  if (!webnav)
+    return null;
+  delete this.gPageLoader;
+  return this.gPageLoader = webnav.QueryInterface(Ci.nsIWebPageDescriptor);
+});
+
 try {
   var prefService = Components.classes["@mozilla.org/preferences-service;1"]
                               .getService(Components.interfaces.nsIPrefService);
   gPrefs = prefService.getBranch(null);
 } catch (ex) {
 }
 
 var gSelectionListener = {
@@ -63,121 +84,63 @@ var gSelectionListener = {
   notifySelectionChanged: function(doc, sel, reason)
   {
     // Coalesce notifications within 100ms intervals.
     if (!this.timeout)
       this.timeout = setTimeout(updateStatusBar, 100);
   }
 }
 
-var gViewSourceProgressListener = {
-
-  QueryInterface: function (aIID) {
-    if (aIID.equals(Ci.nsIWebProgressListener) ||
-        aIID.equals(Ci.nsISupportsWeakReference))
-      return this;
-    throw Cr.NS_NOINTERFACE;
-  },
-
-  onStateChange: function (aWebProgress, aRequest, aStateFlags, aStatus) {
-  },
-
-  onProgressChange: function (aWebProgress, aRequest,
-                              aCurSelfProgress, aMaxSelfProgress,
-                              aCurTotalProgress, aMaxTotalProgress) {
-  },
-
-  onLocationChange: function (aWebProgress, aRequest, aLocationURI) {
-    UpdateBackForwardCommands(getBrowser().webNavigation);
-  },
-
-  onStatusChange: function (aWebProgress, aRequest, aStatus, aMessage) {
-  },
-
-  onSecurityChange: function (aWebProgress, aRequest, aState) {
-  }
-
-}
-
 function onLoadViewSource() 
 {
   viewSource(window.arguments[0]);
   document.commandDispatcher.focusedWindow = content;
       
-  if (isHistoryEnabled()) {
-    // Attach the progress listener.
-    getBrowser().addProgressListener(gViewSourceProgressListener, 
-        Components.interfaces.nsIWebProgress.NOTIFY_ALL);
-  } else {
+  if (!isHistoryEnabled()) {
     // Disable the BACK and FORWARD commands and hide the related menu items.
     var viewSourceNavigation = document.getElementById("viewSourceNavigation");
     viewSourceNavigation.setAttribute("disabled", "true");
     viewSourceNavigation.setAttribute("hidden", "true");
   }
 }
 
-function onUnloadViewSource() 
-{
-  // Detach the progress listener.
-  if (isHistoryEnabled()) {
-    getBrowser().removeProgressListener(gViewSourceProgressListener);
-  }
-}
-
 function isHistoryEnabled() {
-  return !getBrowser().hasAttribute("disablehistory");
+  return !gBrowser.hasAttribute("disablehistory");
 }
 
-function getBrowser()
-{
-  if (!gBrowser)
-    gBrowser = document.getElementById("content");
-  return gBrowser;
-}
-
-function getSelectionController()
-{
-  return getBrowser().docShell
-    .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-    .getInterface(Components.interfaces.nsISelectionDisplay)
-    .QueryInterface(nsISelectionController);
-
-}
-
-function getViewSourceBundle()
-{
-  if (!gViewSourceBundle)
-    gViewSourceBundle = document.getElementById("viewSourceBundle");
-  return gViewSourceBundle;
+function getSelectionController() {
+  return gBrowser.docShell
+                 .QueryInterface(Ci.nsIInterfaceRequestor)
+                 .getInterface(Ci.nsISelectionDisplay)
+                 .QueryInterface(Ci.nsISelectionController);
 }
 
 function viewSource(url)
 {
   if (!url)
-    return false; // throw Components.results.NS_ERROR_FAILURE;
+    return; // throw Components.results.NS_ERROR_FAILURE;
     
   var viewSrcUrl = "view-source:" + url;
 
-  getBrowser().addEventListener("unload", onUnloadContent, true);
-  getBrowser().addEventListener("load", onLoadContent, true);
+  gBrowser.addEventListener("pagehide", onUnloadContent, true);
+  gBrowser.addEventListener("pageshow", onLoadContent, true);
 
   var loadFromURL = true;
-  //
+
   // Parse the 'arguments' supplied with the dialog.
   //    arg[0] - URL string.
   //    arg[1] - Charset value in the form 'charset=xxx'.
   //    arg[2] - Page descriptor used to load content from the cache.
   //    arg[3] - Line number to go to.
   //    arg[4] - Whether charset was forced by the user
-  //
+
   if ("arguments" in window) {
     var arg;
-    //
+
     // Set the charset of the viewsource window...
-    //
     var charset;
     if (window.arguments.length >= 2) {
       arg = window.arguments[1];
 
       try {
         if (typeof(arg) == "string" && arg.indexOf('charset=') != -1) {
           var arrayArgComponents = arg.split('=');
           if (arrayArgComponents) {
@@ -191,132 +154,122 @@ function viewSource(url)
       }
     }
     // If the document had a forced charset, set it here also
     if (window.arguments.length >= 5) {
       arg = window.arguments[4];
 
       try {
         if (arg === true) {
-          var docCharset = getBrowser().docShell.QueryInterface
-                             (Components.interfaces.nsIDocCharset);
+          var docCharset = gBrowser.docShell.QueryInterface(Ci.nsIDocCharset);
           docCharset.charset = charset;
         }
       } catch (ex) {
         // Ignore the failure and keep processing arguments...
       }
     }
-    //
+
     // Get any specified line to jump to.
-    //
     if (window.arguments.length >= 4) {
       arg = window.arguments[3];
       gGoToLine = parseInt(arg);
     }
-    //
+
     // Use the page descriptor to load the content from the cache (if
     // available).
-    //
     if (window.arguments.length >= 3) {
       arg = window.arguments[2];
 
       try {
         if (typeof(arg) == "object" && arg != null) {
-          var PageLoader = getBrowser().webNavigation.QueryInterface(pageLoaderIface);
-
-          //
           // Load the page using the page descriptor rather than the URL.
           // This allows the content to be fetched from the cache (if
           // possible) rather than the network...
-          //
-          PageLoader.loadPage(arg, pageLoaderIface.DISPLAY_AS_SOURCE);
+          gPageLoader.loadPage(arg, gPageLoader.DISPLAY_AS_SOURCE);
 
           // The content was successfully loaded.
           loadFromURL = false;
 
           // Record the page load in the session history so <back> will work.
           var shEntrySource = arg.QueryInterface(Ci.nsISHEntry);
           var shEntry = Cc["@mozilla.org/browser/session-history-entry;1"].createInstance(Ci.nsISHEntry);
           shEntry.setURI(makeURI(viewSrcUrl, null, null));
           shEntry.setTitle(viewSrcUrl);
           shEntry.loadType = Ci.nsIDocShellLoadInfo.loadHistory;
           shEntry.cacheKey = shEntrySource.cacheKey;
-          getBrowser().webNavigation.sessionHistory
-                      .QueryInterface(Ci.nsISHistoryInternal)
-                      .addEntry(shEntry, true);
+          gBrowser.sessionHistory
+                  .QueryInterface(Ci.nsISHistoryInternal)
+                  .addEntry(shEntry, true);
         }
       } catch(ex) {
         // Ignore the failure.  The content will be loaded via the URL
         // that was supplied in arg[0].
       }
     }
   }
 
   if (loadFromURL) {
-    //
     // Currently, an exception is thrown if the URL load fails...
-    //
-    var loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE;
-    getBrowser().webNavigation.loadURI(viewSrcUrl, loadFlags, null, null, null);
+    var loadFlags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE;
+    getWebNavigation().loadURI(viewSrcUrl, loadFlags, null, null, null);
   }
 
-  //check the view_source.wrap_long_lines pref and set the menuitem's checked attribute accordingly
+  // Check the view_source.wrap_long_lines pref and set the menuitem's checked
+  // attribute accordingly.
   if (gPrefs) {
     try {
       var wraplonglinesPrefValue = gPrefs.getBoolPref("view_source.wrap_long_lines");
 
       if (wraplonglinesPrefValue)
-        document.getElementById('menu_wrapLongLines').setAttribute("checked", "true");
+        document.getElementById("menu_wrapLongLines").setAttribute("checked", "true");
     } catch (ex) {
     }
     try {
-      document.getElementById("menu_highlightSyntax").setAttribute("checked", gPrefs.getBoolPref("view_source.syntax_highlight"));
+      document.getElementById("menu_highlightSyntax").setAttribute("checked",
+        gPrefs.getBoolPref("view_source.syntax_highlight"));
     } catch (ex) {
     }
   } else {
     document.getElementById("menu_highlightSyntax").setAttribute("hidden", "true");
   }
 
   window.addEventListener("AppCommand", HandleAppCommandEvent, true);
   window.content.focus();
-
-  return true;
 }
 
 function onLoadContent()
 {
-  //
   // If the view source was opened with a "go to line" argument.
-  //
   if (gGoToLine > 0) {
     goToLine(gGoToLine);
     gGoToLine = 0;
   }
   document.getElementById('cmd_goToLine').removeAttribute('disabled');
 
   // Register a listener so that we can show the caret position on the status bar.
   window.content.getSelection()
-   .QueryInterface(nsISelectionPrivate)
+   .QueryInterface(Ci.nsISelectionPrivate)
    .addSelectionListener(gSelectionListener);
   gSelectionListener.attached = true;
+
+  if (isHistoryEnabled())
+    UpdateBackForwardCommands();
 }
 
 function onUnloadContent()
 {
-  //
   // Disable "go to line" while reloading due to e.g. change of charset
   // or toggling of syntax highlighting.
-  //
   document.getElementById('cmd_goToLine').setAttribute('disabled', 'true');
 
   // If we're not just unloading the initial "about:blank" which doesn't have
   // a selection listener, get rid of it so it doesn't try to fire after the
   // window has gone away.
   if (gSelectionListener.attached) {
-    window.content.getSelection().QueryInterface(nsISelectionPrivate)
+    window.content.getSelection().QueryInterface(Ci.nsISelectionPrivate)
           .removeSelectionListener(gSelectionListener);
     gSelectionListener.attached = false;
   }
 }
 
 function HandleAppCommandEvent(evt)
 {
   evt.stopPropagation();
@@ -332,18 +285,18 @@ function HandleAppCommandEvent(evt)
 
 function ViewSourceClose()
 {
   window.close();
 }
 
 function ViewSourceReload()
 {
-  const webNavigation = getBrowser().webNavigation;
-  webNavigation.reload(webNavigation.LOAD_FLAGS_BYPASS_PROXY | webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+  gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY |
+                           Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE);
 }
 
 // Strips the |view-source:| for editPage()
 function ViewSourceEditPage()
 {
   editPage(window.content.location.href.substring(12), window, false);
 }
 
@@ -360,85 +313,83 @@ function onEnterPP()
 }
 
 function onExitPP()
 {
   var toolbox = document.getElementById("viewSource-toolbox");
   toolbox.hidden = false;
 }
 
-function getPPBrowser()
-{
-  return document.getElementById("content");
+function getPPBrowser() {
+  return gBrowser;
 }
 
+// printUtils.js uses this
 function getNavToolbox()
 {
   return document.getElementById("appcontent");
 }
 
 function getWebNavigation()
 {
   try {
     return gBrowser.webNavigation;
   } catch (e) {
     return null;
   }
 }
 
 function ViewSourceGoToLine()
 {
-  var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-        .getService(Components.interfaces.nsIPromptService);
-  var viewSourceBundle = getViewSourceBundle();
+  var promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"]
+                        .getService(Ci.nsIPromptService);
 
   var input = {value:gLastLineFound};
   for (;;) {
     var ok = promptService.prompt(
         window,
-        viewSourceBundle.getString("goToLineTitle"),
-        viewSourceBundle.getString("goToLineText"),
+        gViewSourceBundle.getString("goToLineTitle"),
+        gViewSourceBundle.getString("goToLineText"),
         input,
         null,
         {value:0});
 
-    if (!ok) return;
+    if (!ok)
+      return;
 
     var line = parseInt(input.value, 10);
- 
+
     if (!(line > 0)) {
       promptService.alert(window,
-          viewSourceBundle.getString("invalidInputTitle"),
-          viewSourceBundle.getString("invalidInputText"));
-  
+                          gViewSourceBundle.getString("invalidInputTitle"),
+                          gViewSourceBundle.getString("invalidInputText"));
+
       continue;
     }
 
     var found = goToLine(line);
 
-    if (found) {
+    if (found)
       break;
-    }
 
     promptService.alert(window,
-        viewSourceBundle.getString("outOfRangeTitle"),
-        viewSourceBundle.getString("outOfRangeText"));
+                        gViewSourceBundle.getString("outOfRangeTitle"),
+                        gViewSourceBundle.getString("outOfRangeText"));
   }
 }
 
 function goToLine(line)
 {
   var viewsource = window.content.document.body;
 
-  //
   // The source document is made up of a number of pre elements with
   // id attributes in the format <pre id="line123">, meaning that
   // the first line in the pre element is number 123.
   // Do binary search to find the pre element containing the line.
-  //
+
   var pre;
   for (var lbound = 0, ubound = viewsource.childNodes.length; ; ) {
     var middle = (lbound + ubound) >> 1;
     pre = viewsource.childNodes[middle];
 
     var firstLine = parseInt(pre.id.substring(4));
 
     if (lbound == ubound - 1) {
@@ -461,17 +412,17 @@ function goToLine(line)
 
   var selection = window.content.getSelection();
   selection.removeAllRanges();
 
   // In our case, the range's startOffset is after "\n" on the previous line.
   // Tune the selection at the beginning of the next line and do some tweaking
   // to position the focusNode and the caret at the beginning of the line.
 
-  selection.QueryInterface(nsISelectionPrivate)
+  selection.QueryInterface(Ci.nsISelectionPrivate)
     .interlinePosition = true;
 
   selection.addRange(result.range);
 
   if (!selection.isCollapsed) {
     selection.collapseToEnd();
 
     var offset = result.range.startOffset;
@@ -486,29 +437,29 @@ function goToLine(line)
       // <span>...\n</span><span>...</span> vs.
       // <span>...\n<span>...</span></span><span>...</span>
       node = node.nextSibling ? node.nextSibling : node.parentNode.nextSibling;
       selection.extend(node, 0);
     }
   }
 
   var selCon = getSelectionController();
-  selCon.setDisplaySelection(nsISelectionController.SELECTION_ON);
+  selCon.setDisplaySelection(Ci.nsISelectionController.SELECTION_ON);
   selCon.setCaretVisibilityDuringSelection(true);
 
   // Scroll the beginning of the line into view.
   selCon.scrollSelectionIntoView(
-    nsISelectionController.SELECTION_NORMAL,
-    nsISelectionController.SELECTION_FOCUS_REGION,
+    Ci.nsISelectionController.SELECTION_NORMAL,
+    Ci.nsISelectionController.SELECTION_FOCUS_REGION,
     true);
 
   gLastLineFound = line;
 
   document.getElementById("statusbar-line-col").label =
-    getViewSourceBundle().getFormattedString("statusBarLineCol", [line, 1]);
+    gViewSourceBundle.getFormattedString("statusBarLineCol", [line, 1]);
 
   return true;
 }
 
 function updateStatusBar()
 {
   // Reset the coalesce flag.
   gSelectionListener.timeout = 0;
@@ -520,253 +471,220 @@ function updateStatusBar()
     statusBarField.label = '';
     return;
   }
   if (selection.focusNode.nodeType != Node.TEXT_NODE) {
     return;
   }
 
   var selCon = getSelectionController();
-  selCon.setDisplaySelection(nsISelectionController.SELECTION_ON);
+  selCon.setDisplaySelection(Ci.nsISelectionController.SELECTION_ON);
   selCon.setCaretVisibilityDuringSelection(true);
 
-  var interlinePosition = selection
-      .QueryInterface(nsISelectionPrivate).interlinePosition;
+  var interlinePosition = selection.QueryInterface(Ci.nsISelectionPrivate)
+                                   .interlinePosition;
 
   var result = {};
   findLocation(null, -1, 
       selection.focusNode, selection.focusOffset, interlinePosition, result);
 
-  statusBarField.label = getViewSourceBundle()
-      .getFormattedString("statusBarLineCol", [result.line, result.col]);
+  statusBarField.label = gViewSourceBundle.getFormattedString(
+                           "statusBarLineCol", [result.line, result.col]);
 }
 
-//
 // Loops through the text lines in the pre element. The arguments are either
 // (pre, line) or (node, offset, interlinePosition). result is an out
 // argument. If (pre, line) are specified (and node == null), result.range is
 // a range spanning the specified line. If the (node, offset,
 // interlinePosition) are specified, result.line and result.col are the line
 // and column number of the specified offset in the specified node relative to
 // the whole file.
-//
 function findLocation(pre, line, node, offset, interlinePosition, result)
 {
   if (node && !pre) {
-    //
     // Look upwards to find the current pre element.
-    //
     for (pre = node;
          pre.nodeName != "PRE";
          pre = pre.parentNode);
   }
 
-  //
   // The source document is made up of a number of pre elements with
   // id attributes in the format <pre id="line123">, meaning that
   // the first line in the pre element is number 123.
-  //
   var curLine = parseInt(pre.id.substring(4));
 
-  //
   // Walk through each of the text nodes and count newlines.
-  //
   var treewalker = window.content.document
       .createTreeWalker(pre, NodeFilter.SHOW_TEXT, null, false);
 
-  //
   // The column number of the first character in the current text node.
-  //
   var firstCol = 1;
 
   var found = false;
   for (var textNode = treewalker.firstChild();
        textNode && !found;
        textNode = treewalker.nextNode()) {
 
-    //
     // \r is not a valid character in the DOM, so we only check for \n.
-    //
     var lineArray = textNode.data.split(/\n/);
     var lastLineInNode = curLine + lineArray.length - 1;
 
-    //
     // Check if we can skip the text node without further inspection.
-    //
     if (node ? (textNode != node) : (lastLineInNode < line)) {
       if (lineArray.length > 1) {
         firstCol = 1;
       }
       firstCol += lineArray[lineArray.length - 1].length;
       curLine = lastLineInNode;
       continue;
     }
 
-    //
     // curPos is the offset within the current text node of the first
     // character in the current line.
-    //
     for (var i = 0, curPos = 0;
          i < lineArray.length;
          curPos += lineArray[i++].length + 1) {
 
       if (i > 0) {
         curLine++;
       }
 
       if (node) {
         if (offset >= curPos && offset <= curPos + lineArray[i].length) {
-          //
           // If we are right after the \n of a line and interlinePosition is
           // false, the caret looks as if it were at the end of the previous
           // line, so we display that line and column instead.
-          //
+
           if (i > 0 && offset == curPos && !interlinePosition) {
             result.line = curLine - 1;
             var prevPos = curPos - lineArray[i - 1].length;
             result.col = (i == 1 ? firstCol : 1) + offset - prevPos;
-
           } else {
             result.line = curLine;
             result.col = (i == 0 ? firstCol : 1) + offset - curPos;
           }
           found = true;
 
           break;
         }
 
       } else {
         if (curLine == line && !("range" in result)) {
           result.range = document.createRange();
           result.range.setStart(textNode, curPos);
 
-          //
           // This will always be overridden later, except when we look for
           // the very last line in the file (this is the only line that does
           // not end with \n).
-          //
           result.range.setEndAfter(pre.lastChild);
 
         } else if (curLine == line + 1) {
           result.range.setEnd(textNode, curPos - 1);
           found = true;
           break;
         }
       }
     }
   }
 
   return found || ("range" in result);
 }
 
-//function to toggle long-line wrapping and set the view_source.wrap_long_lines 
-//pref to persist the last state
+// Toggle long-line wrapping and sets the view_source.wrap_long_lines
+// pref to persist the last state.
 function wrapLongLines()
 {
   var myWrap = window.content.document.body;
 
   if (myWrap.className == '')
     myWrap.className = 'wrap';
   else myWrap.className = '';
 
-  //since multiple viewsource windows are possible, another window could have 
-  //affected the pref, so instead of determining the new pref value via the current
-  //pref value, we use myWrap.className  
-  if (gPrefs){
+  // Since multiple viewsource windows are possible, another window could have
+  // affected the pref, so instead of determining the new pref value via the current
+  // pref value, we use myWrap.className.
+  if (gPrefs) {
     try {
       if (myWrap.className == '') {
         gPrefs.setBoolPref("view_source.wrap_long_lines", false);
       }
       else {
         gPrefs.setBoolPref("view_source.wrap_long_lines", true);
       }
     } catch (ex) {
     }
   }
 }
 
-//function to toggle syntax highlighting and set the view_source.syntax_highlight
-//pref to persist the last state
+// Toggles syntax highlighting and sets the view_source.syntax_highlight
+// pref to persist the last state.
 function highlightSyntax()
 {
   var highlightSyntaxMenu = document.getElementById("menu_highlightSyntax");
   var highlightSyntax = (highlightSyntaxMenu.getAttribute("checked") == "true");
   gPrefs.setBoolPref("view_source.syntax_highlight", highlightSyntax);
 
-  var PageLoader = getBrowser().webNavigation.QueryInterface(pageLoaderIface);
-  PageLoader.loadPage(PageLoader.currentDescriptor, pageLoaderIface.DISPLAY_NORMAL);
+  gPageLoader.loadPage(gPageLoader.currentDescriptor, gPageLoader.DISPLAY_NORMAL);
 }
 
 // Fix for bug 136322: this function overrides the function in
 // browser.js to call PageLoader.loadPage() instead of BrowserReloadWithFlags()
 function BrowserSetForcedCharacterSet(aCharset)
 {
-  var docCharset = getBrowser().docShell.QueryInterface(Ci.nsIDocCharset);
+  var docCharset = gBrowser.docShell.QueryInterface(Ci.nsIDocCharset);
   docCharset.charset = aCharset;
   if (isHistoryEnabled()) {
-    var PageLoader = getBrowser().webNavigation.QueryInterface(pageLoaderIface);
-    PageLoader.loadPage(PageLoader.currentDescriptor,
-                        pageLoaderIface.DISPLAY_NORMAL);
+    gPageLoader.loadPage(gPageLoader.currentDescriptor,
+                         gPageLoader.DISPLAY_NORMAL);
   } else {
-    getBrowser().webNavigation
-                .reload(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
+    gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
   }
 }
 
 // fix for bug #229503
 // we need to define BrowserSetForcedDetector() so that we can
 // change auto-detect options in the "View | Character Encoding" menu.
 // As with BrowserSetForcedCharacterSet(), call PageLoader.loadPage() 
 // instead of BrowserReloadWithFlags()
 function BrowserSetForcedDetector(doReload)
 {
-  getBrowser().documentCharsetInfo.forcedDetector = true; 
+  gBrowser.documentCharsetInfo.forcedDetector = true; 
   if (doReload)
   {
     if (isHistoryEnabled()) {
-      var PageLoader = getBrowser().webNavigation
-                                   .QueryInterface(pageLoaderIface);
-      PageLoader.loadPage(PageLoader.currentDescriptor,
-                          pageLoaderIface.DISPLAY_NORMAL);
+      gPageLoader.loadPage(gPageLoader.currentDescriptor,
+                           gPageLoader.DISPLAY_NORMAL);
     } else {
-      getBrowser().webNavigation
-                  .reload(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
+      gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
     }
   }
 }
 
 function BrowserForward(aEvent) {
   try {
-    getBrowser().goForward();
+    gBrowser.goForward();
   }
   catch(ex) {
   }
 }
 
 function BrowserBack(aEvent) {
   try {
-    getBrowser().goBack();
+    gBrowser.goBack();
   }
   catch(ex) {
   }
 }
 
-function UpdateBackForwardCommands(aWebNavigation) {
+function UpdateBackForwardCommands() {
   var backBroadcaster = document.getElementById("Browser:Back");
   var forwardBroadcaster = document.getElementById("Browser:Forward");
 
-  var backDisabled = backBroadcaster.hasAttribute("disabled");
-  var forwardDisabled = forwardBroadcaster.hasAttribute("disabled");
+  if (getWebNavigation().canGoBack)
+    backBroadcaster.removeAttribute("disabled");
+  else
+    backBroadcaster.setAttribute("disabled", "true");
 
-  if (backDisabled == aWebNavigation.canGoBack) {
-    if (backDisabled)
-      backBroadcaster.removeAttribute("disabled");
-    else
-      backBroadcaster.setAttribute("disabled", true);
-  }
-
-  if (forwardDisabled == aWebNavigation.canGoForward) {
-    if (forwardDisabled)
-      forwardBroadcaster.removeAttribute("disabled");
-    else
-      forwardBroadcaster.setAttribute("disabled", true);
-  }
+  if (getWebNavigation().canGoForward)
+    forwardBroadcaster.removeAttribute("disabled");
+  else
+    forwardBroadcaster.setAttribute("disabled", "true");
 }
--- a/toolkit/components/viewsource/content/viewSource.xul
+++ b/toolkit/components/viewsource/content/viewSource.xul
@@ -53,17 +53,16 @@
 %brandDTD;
 <!ENTITY % sourceDTD SYSTEM "chrome://global/locale/viewSource.dtd" >
 %sourceDTD;
 ]>
 
 <window id="viewSource"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="onLoadViewSource();"
-        onunload="onUnloadViewSource();"
         contenttitlesetting="true"
         title="&mainWindow.title;" 
         titlemodifier="&mainWindow.titlemodifier;" 
         titlepreface="&mainWindow.preface;"
         titlemenuseparator ="&mainWindow.titlemodifierseparator;"  
         windowtype="navigator:view-source"
         width="640" height="480"
         screenX="10" screenY="10"