diff --git a/Makefile.in b/Makefile.in
index 2b1c3b88a62..5f823293f57 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -213,6 +213,8 @@ maybe_clobber_profiledbuild:
 endif
 else
 maybe_clobber_profiledbuild:
+	$(RM) $(DIST)/bin/*.pgc
+	find $(DIST)/$(MOZ_APP_NAME) -name "*.pgc" -exec mv {} $(DIST)/bin \;
 endif
 
 .PHONY: maybe_clobber_profiledbuild
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index aa9f364d2f8..e4b30bf3703 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1008,6 +1008,9 @@ pref("devtools.inspector.enabled", true);
 // Enable the style inspector
 pref("devtools.styleinspector.enabled", true);
 
+// Enable the rules view
+pref("devtools.ruleview.enabled", true);
+
 // Enable the Scratchpad tool.
 pref("devtools.scratchpad.enabled", true);
 
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 24ee6669f09..13a8c8103a0 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3908,12 +3908,29 @@ var FullScreen = {
     }
   },
 
+  exitDomFullScreen : function(e) {
+    document.mozCancelFullScreen();
+  },
+
   enterDomFullScreen : function(event) {
-    if (!document.mozFullScreen) {
+    // We receive "mozfullscreenchange" events for each subdocument which
+    // is an ancestor of the document containing the element which requested
+    // full-screen. Only add listeners and show warning etc when the event we
+    // receive is targeted at the chrome document, i.e. only once every time
+    // we enter DOM full-screen mode.
+    if (!document.mozFullScreen || event.target.ownerDocument != document) {
       return;
     }
     this.showWarning(true);
 
+    // Exit DOM full-screen mode upon open, close, or change tab.
+    gBrowser.tabContainer.addEventListener("TabOpen", this.exitDomFullScreen);
+    gBrowser.tabContainer.addEventListener("TabClose", this.exitDomFullScreen);
+    gBrowser.tabContainer.addEventListener("TabSelect", this.exitDomFullScreen);
+
+    // Exit DOM full-screen mode when the browser window loses focus (ALT+TAB, etc).
+    window.addEventListener("deactivate", this.exitDomFullScreen, true);
+
     // Cancel any "hide the toolbar" animation which is in progress, and make
     // the toolbar hide immediately.
     clearInterval(this._animationInterval);
@@ -3946,6 +3963,10 @@ var FullScreen = {
         fullScrToggler.removeEventListener("dragenter", this._expandCallback, false);
       }
       this.cancelWarning();
+      gBrowser.tabContainer.removeEventListener("TabOpen", this.exitDomFullScreen);
+      gBrowser.tabContainer.removeEventListener("TabClose", this.exitDomFullScreen);
+      gBrowser.tabContainer.removeEventListener("TabSelect", this.exitDomFullScreen);
+      window.removeEventListener("deactivate", this.exitDomFullScreen, true);
     }
   },
 
@@ -8169,7 +8190,7 @@ let DownloadMonitorPanel = {
     let maxTime = -Infinity;
     let dls = gDownloadMgr.activeDownloads;
     while (dls.hasMoreElements()) {
-      let dl = dls.getNext().QueryInterface(Ci.nsIDownload);
+      let dl = dls.getNext();
       if (dl.state == gDownloadMgr.DOWNLOAD_DOWNLOADING) {
         // Figure out if this download takes longer
         if (dl.speed > 0 && dl.size > 0)
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index d078c39b64e..1ca600b86d9 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -967,7 +967,7 @@
       <statuspanel id="statusbar-display" inactive="true"/>
     </vbox>
     <splitter id="devtools-side-splitter" hidden="true"/>
-    <vbox id="devtools-sidebar-box" hidden="true" flex="1"
+    <vbox id="devtools-sidebar-box" hidden="true"
           style="min-width: 18em; width: 22em; max-width: 42em;" persist="width">
       <toolbar id="devtools-sidebar-toolbar" nowindowdrag="true"/>
       <deck id="devtools-sidebar-deck" flex="1"/>
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index a5ac971e6ce..418f2b31e63 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1108,6 +1108,7 @@
           <![CDATA[
             var aFromExternal;
             var aRelatedToCurrent;
+            var aIsUTF8;
             if (arguments.length == 2 &&
                 typeof arguments[1] == "object" &&
                 !(arguments[1] instanceof Ci.nsIURI)) {
@@ -1119,6 +1120,7 @@
               aAllowThirdPartyFixup = params.allowThirdPartyFixup;
               aFromExternal         = params.fromExternal;
               aRelatedToCurrent     = params.relatedToCurrent;
+              aIsUTF8               = params.isUTF8;
             }
 
             var bgLoad = (aLoadInBackground != null) ? aLoadInBackground :
@@ -1131,7 +1133,8 @@
                                   ownerTab: owner,
                                   allowThirdPartyFixup: aAllowThirdPartyFixup,
                                   fromExternal: aFromExternal,
-                                  relatedToCurrent: aRelatedToCurrent});
+                                  relatedToCurrent: aRelatedToCurrent,
+                                  isUTF8: aIsUTF8});
             if (!bgLoad)
               this.selectedTab = tab;
 
@@ -1204,6 +1207,7 @@
             var aFromExternal;
             var aRelatedToCurrent;
             var aSkipAnimation;
+            var aIsUTF8;
             if (arguments.length == 2 &&
                 typeof arguments[1] == "object" &&
                 !(arguments[1] instanceof Ci.nsIURI)) {
@@ -1216,6 +1220,7 @@
               aFromExternal         = params.fromExternal;
               aRelatedToCurrent     = params.relatedToCurrent;
               aSkipAnimation        = params.skipAnimation;
+              aIsUTF8               = params.isUTF8;
             }
 
             this._browsers = null; // invalidate cache
@@ -1363,6 +1368,8 @@
                 flags |= Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
               if (aFromExternal)
                 flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL;
+              if (aIsUTF8)
+                flags |= Ci.nsIWebNavigation.LOAD_FLAGS_URI_IS_UTF8;
               try {
                 b.loadURIWithFlags(aURI, flags, aReferrerURI, aCharset, aPostData);
               } catch (ex) {
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 0be8be45af5..1b7dd86548b 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -206,6 +206,7 @@ _BROWSER_FILES = \
                  browser_tabs_isActive.js \
                  browser_tabs_owner.js \
                  browser_urlbarCopying.js \
+                 browser_urlbarEnter.js \
                  browser_urlbarTrimURLs.js \
                  browser_urlHighlight.js \
                  browser_visibleFindSelection.js \
diff --git a/browser/base/content/test/browser_urlbarEnter.js b/browser/base/content/test/browser_urlbarEnter.js
new file mode 100644
index 00000000000..defea1396a2
--- /dev/null
+++ b/browser/base/content/test/browser_urlbarEnter.js
@@ -0,0 +1,69 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_VALUE = "example.com/\xF7?\xF7";
+const START_VALUE = "example.com/%C3%B7?%C3%B7";
+
+function test() {
+  waitForExplicitFinish();
+  runNextTest();
+}
+
+function locationBarEnter(aEvent, aClosure) {
+  executeSoon(function() {
+    gURLBar.focus();
+    EventUtils.synthesizeKey("VK_RETURN", aEvent);
+    addPageShowListener(aClosure);
+  });
+}
+
+function runNextTest() {
+  let test = gTests.shift();
+  if (!test) {
+    finish();
+    return;
+  }
+  
+  info("Running test: " + test.desc);
+  let tab = gBrowser.selectedTab = gBrowser.addTab(START_VALUE);
+  addPageShowListener(function() {
+    locationBarEnter(test.event, function() {
+      test.check(tab);
+
+      // Clean up
+      while (gBrowser.tabs.length > 1)
+        gBrowser.removeTab(gBrowser.selectedTab)
+      runNextTest();
+    });
+  });
+}
+
+let gTests = [
+  { desc: "Simple return keypress",
+    event: {},
+    check: checkCurrent
+  },
+
+  { desc: "Alt+Return keypress",
+    event: { altKey: true },
+    check: checkNewTab,
+  },
+]
+
+function checkCurrent(aTab) {
+  is(gURLBar.value, TEST_VALUE, "Urlbar should preserve the value on return keypress");
+  is(gBrowser.selectedTab, aTab, "New URL was loaded in the current tab");
+}
+
+function checkNewTab(aTab) {
+  is(gURLBar.value, TEST_VALUE, "Urlbar should preserve the value on return keypress");
+  isnot(gBrowser.selectedTab, aTab, "New URL was loaded in a new tab");
+}
+
+function addPageShowListener(aFunc) {
+  gBrowser.selectedBrowser.addEventListener("pageshow", function loadListener() {
+    gBrowser.selectedBrowser.removeEventListener("pageshow", loadListener, false);
+    aFunc();
+  });
+}
+
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index d4f4ce2bd48..8232bf1c4d7 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -326,6 +326,10 @@
             // keyword).
             if (!mayInheritPrincipal)
               flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
+            // If the value wasn't typed, we know that we decoded the value as
+            // UTF-8 (see losslessDecodeURI)
+            if (!this.valueIsTyped)
+              flags |= Ci.nsIWebNavigation.LOAD_FLAGS_URI_IS_UTF8;
             gBrowser.loadURIWithFlags(url, flags, null, null, postData);
           }
 
@@ -361,6 +365,8 @@
               let params = { allowThirdPartyFixup: true, postData: postData };
               if (altEnter)
                 params.inBackground = false;
+              if (!this.valueIsTyped)
+                params.isUTF8 = true;
               openUILinkIn(url, where, params);
             }
           } else {
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 5c99aff2e22..f1f7e40292b 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -199,6 +199,8 @@ function openLinkIn(url, where, params) {
   var aRelatedToCurrent     = params.relatedToCurrent;
   var aInBackground         = params.inBackground;
   var aDisallowInheritPrincipal = params.disallowInheritPrincipal;
+  // Currently, this parameter works only for where=="tab" or "current"
+  var aIsUTF8               = params.isUTF8;
 
   if (where == "save") {
     saveURL(url, null, null, true, null, aReferrerURI);
@@ -272,6 +274,8 @@ function openLinkIn(url, where, params) {
       flags |= Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
     if (aDisallowInheritPrincipal)
       flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
+    if (aIsUTF8)
+      flags |= Ci.nsIWebNavigation.LOAD_FLAGS_URI_IS_UTF8;
     w.gBrowser.loadURIWithFlags(url, flags, aReferrerURI, null, aPostData);
     break;
   case "tabshifted":
@@ -285,7 +289,8 @@ function openLinkIn(url, where, params) {
                        postData: aPostData,
                        inBackground: loadInBackground,
                        allowThirdPartyFixup: aAllowThirdPartyFixup,
-                       relatedToCurrent: aRelatedToCurrent});
+                       relatedToCurrent: aRelatedToCurrent,
+                       isUTF8: aIsUTF8});
     break;
   }
 
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index f02916608e1..d851d67119b 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -761,6 +761,7 @@ BrowserGlue.prototype = {
   _showTelemetryNotification: function BG__showTelemetryNotification() {
     const PREF_TELEMETRY_PROMPTED = "toolkit.telemetry.prompted";
     const PREF_TELEMETRY_ENABLED  = "toolkit.telemetry.enabled";
+    const PREF_TELEMETRY_REJECTED  = "toolkit.telemetry.rejected";
     const PREF_TELEMETRY_INFOURL  = "toolkit.telemetry.infoURL";
     const PREF_TELEMETRY_SERVER_OWNER = "toolkit.telemetry.server_owner";
     // This is used to reprompt users when privacy message changes
@@ -803,7 +804,9 @@ BrowserGlue.prototype = {
                       label:     browserBundle.GetStringFromName("telemetryNoButtonLabel"),
                       accessKey: browserBundle.GetStringFromName("telemetryNoButtonAccessKey"),
                       popup:     null,
-                      callback:  function(aNotificationBar, aButton) {}
+                      callback:  function(aNotificationBar, aButton) {
+                        Services.prefs.setBoolPref(PREF_TELEMETRY_REJECTED, true);
+                      }
                     }
                   ];
 
@@ -811,6 +814,7 @@ BrowserGlue.prototype = {
     Services.prefs.setIntPref(PREF_TELEMETRY_PROMPTED, TELEMETRY_PROMPT_REV);
 
     var notification = notifyBox.appendNotification(telemetryPrompt, "telemetry", null, notifyBox.PRIORITY_INFO_LOW, buttons);
+    notification.setAttribute("hideclose", true);
     notification.persistence = 6; // arbitrary number, just so bar sticks around for a bit
 
     let XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
diff --git a/browser/devtools/highlighter/TreePanel.jsm b/browser/devtools/highlighter/TreePanel.jsm
index 366bed04625..cd46ebcd0b5 100644
--- a/browser/devtools/highlighter/TreePanel.jsm
+++ b/browser/devtools/highlighter/TreePanel.jsm
@@ -458,6 +458,9 @@ TreePanel.prototype = {
     editorInput.value = aAttrVal;
     editorInput.select();
 
+    // remove tree key navigation events
+    this.treeIFrame.removeEventListener("keypress", this.IUI, false);
+
     // listen for editor specific events
     this.bindEditorEvent(editor, "click", function(aEvent) {
       aEvent.stopPropagation();
@@ -515,8 +518,12 @@ TreePanel.prototype = {
   {
     if (aEvent.which == this.window.KeyEvent.DOM_VK_RETURN) {
       this.saveEditor();
+      aEvent.preventDefault();
+      aEvent.stopPropagation();
     } else if (aEvent.keyCode == this.window.KeyEvent.DOM_VK_ESCAPE) {
       this.closeEditor();
+      aEvent.preventDefault();
+      aEvent.stopPropagation();
     }
   },
 
@@ -546,6 +553,9 @@ TreePanel.prototype = {
     this.editingContext = null;
     this.editingEvents = {};
 
+    // re-add navigation listener
+    this.treeIFrame.addEventListener("keypress", this.IUI, false);
+
     // event notification
     Services.obs.notifyObservers(null, this.IUI.INSPECTOR_NOTIFICATIONS.EDITOR_CLOSED,
                                   null);
@@ -567,6 +577,7 @@ TreePanel.prototype = {
     this.editingContext.attrObj.innerHTML = editorInput.value;
 
     this.IUI.isDirty = true;
+    this.IUI.nodeChanged(this.registrationObject);
 
     // event notification
     Services.obs.notifyObservers(null, this.IUI.INSPECTOR_NOTIFICATIONS.EDITOR_SAVED,
diff --git a/browser/devtools/highlighter/inspector.jsm b/browser/devtools/highlighter/inspector.jsm
index a6021ea8e4b..86a281e4651 100644
--- a/browser/devtools/highlighter/inspector.jsm
+++ b/browser/devtools/highlighter/inspector.jsm
@@ -50,6 +50,7 @@ var EXPORTED_SYMBOLS = ["InspectorUI"];
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/TreePanel.jsm");
+Cu.import("resource:///modules/devtools/CssRuleView.jsm");
 
 const INSPECTOR_INVISIBLE_ELEMENTS = {
   "head": true,
@@ -78,9 +79,15 @@ const INSPECTOR_NOTIFICATIONS = {
   // Fires once the Inspector is closed.
   CLOSED: "inspector-closed",
 
+  // Fires when the Inspector is reopened after tab-switch.
+  STATE_RESTORED: "inspector-state-restored",
+
   // Fires when the Tree Panel is opened and initialized.
   TREEPANELREADY: "inspector-treepanel-ready",
 
+  // Fires when the CSS Rule View is opened and initialized.
+  RULEVIEWREADY: "inspector-ruleview-ready",
+
   // Event notifications for the attribute-value editor
   EDITOR_OPENED: "inspector-editor-opened",
   EDITOR_CLOSED: "inspector-editor-closed",
@@ -740,6 +747,7 @@ InspectorUI.prototype = {
   toolEvents: null,
   inspecting: false,
   treePanelEnabled: true,
+  ruleViewEnabled: true,
   isDirty: false,
   store: null,
 
@@ -891,6 +899,11 @@ InspectorUI.prototype = {
       this.treePanel = new TreePanel(this.chromeWin, this);
     }
 
+    if (Services.prefs.getBoolPref("devtools.ruleview.enabled") &&
+        !this.toolRegistered("ruleview")) {
+      this.registerRuleView();
+    }
+
     if (Services.prefs.getBoolPref("devtools.styleinspector.enabled") &&
         !this.toolRegistered("styleinspector")) {
       this.stylePanel = new StyleInspector(this.chromeWin, this);
@@ -910,6 +923,31 @@ InspectorUI.prototype = {
     this.initializeHighlighter();
   },
 
+  /**
+   * Register the Rule View in the Sidebar.
+   */
+  registerRuleView: function IUI_registerRuleView()
+  {
+    let isOpen = this.isRuleViewOpen.bind(this);
+
+    this.ruleViewObject = {
+      id: "ruleview",
+      label: this.strings.GetStringFromName("ruleView.label"),
+      tooltiptext: this.strings.GetStringFromName("ruleView.tooltiptext"),
+      accesskey: this.strings.GetStringFromName("ruleView.accesskey"),
+      context: this,
+      get isOpen() isOpen(),
+      show: this.openRuleView,
+      hide: this.closeRuleView,
+      onSelect: this.selectInRuleView,
+      panel: null,
+      unregister: this.destroyRuleView,
+      sidebar: true,
+    };
+
+    this.registerTool(this.ruleViewObject);
+  },
+
   /**
    * Register and initialize any included tools.
    */
@@ -1120,6 +1158,19 @@ InspectorUI.prototype = {
     this.toolsSelect(aScroll);
   },
 
+  /**
+   * Called when the highlighted node is changed by a tool.
+   *
+   * @param object aUpdater
+   *        The tool that triggered the update (if any), that tool's
+   *        onChanged will not be called.
+   */
+  nodeChanged: function IUI_nodeChanged(aUpdater)
+  {
+    this.highlighter.highlight();
+    this.toolsOnChanged(aUpdater);
+  },
+
   /////////////////////////////////////////////////////////////////////////
   //// Event Handling
 
@@ -1271,6 +1322,94 @@ InspectorUI.prototype = {
     }
   },
 
+  /////////////////////////////////////////////////////////////////////////
+  //// CssRuleView methods
+
+  /**
+   * Is the cssRuleView open?
+   */
+  isRuleViewOpen: function IUI_isRuleViewOpen()
+  {
+    return this.isSidebarOpen && this.ruleButton.hasAttribute("checked") &&
+      (this.sidebarDeck.selectedPanel == this.getToolIframe(this.ruleViewObject));
+  },
+
+  /**
+   * Convenience getter to retrieve the Rule Button.
+   */
+  get ruleButton()
+  {
+    return this.chromeDoc.getElementById(
+      this.getToolbarButtonId(this.ruleViewObject.id));
+  },
+
+  /**
+   * Open the CssRuleView.
+   */
+  openRuleView: function IUI_openRuleView()
+  {
+    let iframe = this.getToolIframe(this.ruleViewObject);
+    let boundLoadListener = function() {
+      iframe.removeEventListener("load", boundLoadListener, true);
+      let doc = iframe.contentDocument;
+      this.ruleView = new CssRuleView(doc);
+      this.boundRuleViewChanged = this.ruleViewChanged.bind(this);
+      this.ruleView.element.addEventListener("CssRuleViewChanged",
+                                             this.boundRuleViewChanged);
+
+      doc.documentElement.appendChild(this.ruleView.element);
+      this.ruleView.highlight(this.selection);
+      Services.obs.notifyObservers(null,
+        INSPECTOR_NOTIFICATIONS.RULEVIEWREADY, null);
+    }.bind(this);
+
+    iframe.addEventListener("load", boundLoadListener, true);
+
+    iframe.setAttribute("src", "chrome://browser/content/devtools/cssruleview.xul");
+  },
+
+  /**
+   * Stub to Close the CSS Rule View. Does nothing currently because the
+   * Rule View lives in the sidebar.
+   */
+  closeRuleView: function IUI_closeRuleView()
+  {
+    // do nothing for now
+  },
+
+  /**
+   * Update the selected node in the Css Rule View.
+   * @param {nsIDOMnode} the selected node.
+   */
+  selectInRuleView: function IUI_selectInRuleView(aNode)
+  {
+    if (this.ruleView)
+      this.ruleView.highlight(aNode);
+  },
+
+  ruleViewChanged: function IUI_ruleViewChanged()
+  {
+    this.isDirty = true;
+    this.nodeChanged(this.ruleViewObject);
+  },
+
+  /**
+   * Destroy the rule view.
+   */
+  destroyRuleView: function IUI_destroyRuleView()
+  {
+    let iframe = this.getToolIframe(this.ruleViewObject);
+    iframe.parentNode.removeChild(iframe);
+
+    if (this.ruleView) {
+      this.ruleView.element.removeEventListener("CssRuleViewChanged",
+                                                this.boundRuleViewChanged);
+      delete boundRuleViewChanged;
+      this.ruleView.clear();
+      delete this.ruleView;
+    }
+  },
+
   /////////////////////////////////////////////////////////////////////////
   //// Utility Methods
 
@@ -1552,10 +1691,6 @@ InspectorUI.prototype = {
 
     // wire up button to show the iframe
     this.bindToolEvent(btn, "click", function showIframe() {
-      let visible = this.sidebarDeck.selectedPanel == iframe;
-      if (!visible) {
-        sidebarDeck.selectedPanel = iframe;
-      }
       this.toolShow(aRegObj);
     }.bind(this));
   },
@@ -1576,10 +1711,18 @@ InspectorUI.prototype = {
    */
   toolShow: function IUI_toolShow(aTool)
   {
-    aTool.show.call(aTool.context, this.selection);
-
     let btn = this.chromeDoc.getElementById(this.getToolbarButtonId(aTool.id));
     btn.setAttribute("checked", "true");
+    if (aTool.sidebar) {
+      this.sidebarDeck.selectedPanel = this.getToolIframe(aTool);
+      this.sidebarTools.forEach(function(other) {
+        if (other != aTool)
+          this.chromeDoc.getElementById(
+            this.getToolbarButtonId(other.id)).removeAttribute("checked");
+      }.bind(this));
+    }
+
+    aTool.show.call(aTool.context, this.selection);
   },
 
   /**
@@ -1689,16 +1832,24 @@ InspectorUI.prototype = {
   restoreToolState: function IUI_restoreToolState(aWinID)
   {
     let openTools = this.store.getValue(aWinID, "openTools");
+    let activeSidebarTool;
     if (openTools) {
       this.toolsDo(function IUI_toolsOnShow(aTool) {
         if (aTool.id in openTools) {
           if (aTool.sidebar && !this.isSidebarOpen) {
             this.showSidebar();
+            activeSidebarTool = aTool;
           }
           this.toolShow(aTool);
         }
       }.bind(this));
+      this.sidebarTools.forEach(function(tool) {
+        if (tool != activeSidebarTool)
+          this.chromeDoc.getElementById(
+            this.getToolbarButtonId(tool.id)).removeAttribute("checked");
+      }.bind(this));
     }
+    Services.obs.notifyObservers(null, INSPECTOR_NOTIFICATIONS.STATE_RESTORED, null);
   },
 
   /**
@@ -1723,13 +1874,29 @@ InspectorUI.prototype = {
    */
   toolsDim: function IUI_toolsDim(aState)
   {
-    this.toolsDo(function IUI_toolsOnSelect(aTool) {
+    this.toolsDo(function IUI_toolsDim(aTool) {
       if (aTool.isOpen && "dim" in aTool) {
         aTool.dim.call(aTool.context, aState);
       }
     });
   },
 
+  /**
+   * Notify registered tools of changes to the highlighted element.
+   *
+   * @param object aUpdater
+   *        The tool that triggered the update (if any), that tool's
+   *        onChanged will not be called.
+   */
+  toolsOnChanged: function IUI_toolsChanged(aUpdater)
+  {
+    this.toolsDo(function IUI_toolsOnChanged(aTool) {
+      if (aTool.isOpen && ("onChanged" in aTool) && aTool != aUpdater) {
+        aTool.onChanged.call(aTool.context);
+      }
+    });
+  },
+
   /**
    * Loop through all registered tools and pass each into the provided function
    * @param aFunction The function to which each tool is to be passed
@@ -1937,8 +2104,13 @@ InspectorProgressListener.prototype = {
       return;
     }
 
-    // Skip non-start states.
-    if (!(aFlag & Ci.nsIWebProgressListener.STATE_START)) {
+    let isStart = aFlag & Ci.nsIWebProgressListener.STATE_START;
+    let isDocument = aFlag & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT;
+    let isNetwork = aFlag & Ci.nsIWebProgressListener.STATE_IS_NETWORK;
+    let isRequest = aFlag & Ci.nsIWebProgressListener.STATE_IS_REQUEST;
+
+    // Skip non-interesting states.
+    if (!isStart || !isDocument || !isRequest || !isNetwork) {
       return;
     }
 
diff --git a/browser/devtools/highlighter/test/Makefile.in b/browser/devtools/highlighter/test/Makefile.in
index 0705e1d9cd8..a665483c651 100644
--- a/browser/devtools/highlighter/test/Makefile.in
+++ b/browser/devtools/highlighter/test/Makefile.in
@@ -65,6 +65,8 @@ _BROWSER_FILES = \
 		browser_inspector_keybindings.js \
 		browser_inspector_breadcrumbs.html \
 		browser_inspector_breadcrumbs.js \
+		browser_inspector_bug_699308_iframe_navigation.js \
+        browser_inspector_changes.js \
 		$(NULL)
 
 # Disabled due to constant failures
diff --git a/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js b/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
new file mode 100644
index 00000000000..50beccc16e2
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_bug_699308_iframe_navigation.js
@@ -0,0 +1,77 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let iframe;
+let iframeLoads = 0;
+let checksAfterLoads = false;
+
+function startTest() {
+  ok(window.InspectorUI, "InspectorUI variable exists");
+  Services.obs.addObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runInspectorTests() {
+  Services.obs.removeObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, null);
+
+  iframe = content.document.querySelector("iframe");
+  ok(iframe, "found the iframe element");
+
+  ok(InspectorUI.inspecting, "Inspector is highlighting");
+  ok(InspectorUI.isInspectorOpen, "Inspector is open");
+
+  Services.obs.addObserver(finishTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+  iframe.addEventListener("load", onIframeLoad, false);
+
+  executeSoon(function() {
+    iframe.contentWindow.location = "javascript:location.reload()";
+  });
+}
+
+function onIframeLoad() {
+  if (++iframeLoads != 2) {
+    executeSoon(function() {
+      iframe.contentWindow.location = "javascript:location.reload()";
+    });
+    return;
+  }
+
+  iframe.removeEventListener("load", onIframeLoad, false);
+
+  ok(InspectorUI.inspecting, "Inspector is highlighting after iframe nav");
+  ok(InspectorUI.isInspectorOpen, "Inspector Panel is open after iframe nav");
+
+  checksAfterLoads = true;
+
+  InspectorUI.closeInspectorUI();
+}
+
+function finishTest() {
+  Services.obs.removeObserver(finishTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+
+  is(iframeLoads, 2, "iframe loads");
+  ok(checksAfterLoads, "the Inspector tests got the chance to run after iframe reloads");
+  ok(!InspectorUI.isInspectorOpen, "Inspector Panel is not open");
+
+  iframe = null;
+  gBrowser.removeCurrentTab();
+  executeSoon(finish);
+}
+
+function test() {
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onBrowserLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onBrowserLoad, true);
+    waitForFocus(startTest, content);
+  }, true);
+
+  content.location = "data:text/html,<p>bug 699308 - test iframe navigation" +
+    "<iframe src='data:text/html,hello world'></iframe>";
+}
diff --git a/browser/devtools/highlighter/test/browser_inspector_changes.js b/browser/devtools/highlighter/test/browser_inspector_changes.js
new file mode 100644
index 00000000000..cec5ac15f62
--- /dev/null
+++ b/browser/devtools/highlighter/test/browser_inspector_changes.js
@@ -0,0 +1,158 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Inspect Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dave Camp <dcamp@mozilla.com>
+ *   Rob Campbell <rcampbell@mozilla.com>
+ *
+ * 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
+ * decision by deleting the provisions above and replace them with the notice
+ * 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 ***** */
+let doc;
+let testDiv;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<div id="testdiv">Test div!</div>';
+  doc.title = "Inspector Change Test";
+  startInspectorTests();
+}
+
+
+function getInspectorProp(aName)
+{
+  for each (let view in InspectorUI.stylePanel.cssHtmlTree.propertyViews) {
+    if (view.name == aName) {
+      return view;
+    }
+  }
+  return null;
+}
+
+function startInspectorTests()
+{
+  ok(InspectorUI, "InspectorUI variable exists");
+  Services.obs.addObserver(runInspectorTests,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
+  InspectorUI.toggleInspectorUI();
+}
+
+function runInspectorTests()
+{
+  Services.obs.removeObserver(runInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
+  testDiv = doc.getElementById("testdiv");
+
+  testDiv.style.fontSize = "10px";
+
+  InspectorUI.inspectNode(testDiv);
+  InspectorUI.stopInspecting();
+
+  // Start up the style inspector panel...
+  Services.obs.addObserver(stylePanelTests, "StyleInspector-populated", false);
+
+  executeSoon(function() {
+    InspectorUI.showSidebar();
+    document.getElementById(InspectorUI.getToolbarButtonId("styleinspector")).click();
+  });
+}
+
+function stylePanelTests()
+{
+  Services.obs.removeObserver(stylePanelTests, "StyleInspector-populated");
+
+  ok(InspectorUI.isSidebarOpen, "Inspector Sidebar is open");
+  ok(InspectorUI.stylePanel.cssHtmlTree, "Style Panel has a cssHtmlTree");
+
+  let propView = getInspectorProp("font-size");
+  is(propView.value, "10px", "Style inspector should be showing the correct font size.");
+
+  Services.obs.addObserver(stylePanelAfterChange, "StyleInspector-populated", false);
+
+  testDiv.style.fontSize = "15px";
+  InspectorUI.nodeChanged();
+}
+
+function stylePanelAfterChange()
+{
+  Services.obs.removeObserver(stylePanelAfterChange, "StyleInspector-populated");
+
+  let propView = getInspectorProp("font-size");
+  is(propView.value, "15px", "Style inspector should be showing the new font size.");
+
+  stylePanelNotActive();
+}
+
+function stylePanelNotActive()
+{
+  // Tests changes made while the style panel is not active.
+  InspectorUI.ruleButton.click();
+  executeSoon(function() {
+    testDiv.style.fontSize = "20px";
+    Services.obs.addObserver(stylePanelAfterSwitch, "StyleInspector-populated", false);
+    document.getElementById(InspectorUI.getToolbarButtonId("styleinspector")).click();
+  });
+}
+
+function stylePanelAfterSwitch()
+{
+  Services.obs.removeObserver(stylePanelAfterSwitch, "StyleInspector-populated");
+
+  let propView = getInspectorProp("font-size");
+  is(propView.value, "20px", "Style inspector should be showing the newest font size.");
+
+  Services.obs.addObserver(finishTest, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+  executeSoon(function() {
+    InspectorUI.closeInspectorUI(true);
+  });
+}
+
+function finishTest()
+{
+  Services.obs.removeObserver(finishTest,
+    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED);
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,basic tests for inspector";
+}
+
diff --git a/browser/devtools/highlighter/test/browser_inspector_editor.js b/browser/devtools/highlighter/test/browser_inspector_editor.js
index 6020fd09fe1..7356b93cba4 100644
--- a/browser/devtools/highlighter/test/browser_inspector_editor.js
+++ b/browser/devtools/highlighter/test/browser_inspector_editor.js
@@ -34,13 +34,14 @@ function setupHTMLPanel()
 {
   Services.obs.removeObserver(setupHTMLPanel, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
   Services.obs.addObserver(runEditorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.TREEPANELREADY, false);
-  InspectorUI.treePanel.open();
+  InspectorUI.toolShow(InspectorUI.treePanel.registrationObject);
 }
 
 function runEditorTests()
 {
   Services.obs.removeObserver(runEditorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.TREEPANELREADY);
   InspectorUI.stopInspecting();
+  InspectorUI.inspectNode(doc.body, true);
 
   // setup generator for async test steps
   editorTestSteps = doEditorTestSteps();
@@ -54,6 +55,14 @@ function runEditorTests()
   doNextStep();
 }
 
+function highlighterTrap()
+{
+  // bug 696107
+  Services.obs.removeObserver(highlighterTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
+  ok(false, "Highlighter moved. Shouldn't be here!");
+  finishUp();
+}
+
 function doEditorTestSteps()
 {
   let treePanel = InspectorUI.treePanel;
@@ -78,6 +87,9 @@ function doEditorTestSteps()
 
   // Step 2: validate editing session, enter new attribute value into editor, and save input
   ok(InspectorUI.treePanel.editingContext, "Step 2: editor session started");
+  let selection = InspectorUI.selection;
+
+  ok(selection, "Selection is: " + selection);
 
   let editorVisible = editor.classList.contains("editing");
   ok(editorVisible, "editor popup visible");
@@ -103,8 +115,13 @@ function doEditorTestSteps()
   editorInput.value = "Hello World";
   editorInput.focus();
 
-  // hit <enter> to save the inputted value
+  Services.obs.addObserver(highlighterTrap,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
+
+  // hit <enter> to save the textbox value
   executeSoon(function() {
+    // Extra key to test that keyboard handlers have been removed. bug 696107.
+    EventUtils.synthesizeKey("VK_LEFT", {}, attrValNode_id.ownerDocument.defaultView);
     EventUtils.synthesizeKey("VK_RETURN", {}, attrValNode_id.ownerDocument.defaultView);
   });
 
@@ -112,6 +129,8 @@ function doEditorTestSteps()
   yield;
   yield; // End of Step 2
 
+  // remove this from previous step
+  Services.obs.removeObserver(highlighterTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
 
   // Step 3: validate that the previous editing session saved correctly, then open editor on `class` attribute value
   ok(!treePanel.editingContext, "Step 3: editor session ended");
@@ -210,16 +229,14 @@ function doEditorTestSteps()
   is(attrValNode_id.innerHTML, "Hello World", "attribute-value node in HTML panel *not* updated");
 
   // End of Step 8
-
-  // end of all steps, so clean up
-  Services.obs.removeObserver(doNextStep, InspectorUI.INSPECTOR_NOTIFICATIONS.EDITOR_OPENED, false);
-  Services.obs.removeObserver(doNextStep, InspectorUI.INSPECTOR_NOTIFICATIONS.EDITOR_CLOSED, false);
-  Services.obs.removeObserver(doNextStep, InspectorUI.INSPECTOR_NOTIFICATIONS.EDITOR_SAVED, false);
-
   executeSoon(finishUp);
 }
 
 function finishUp() {
+  // end of all steps, so clean up
+  Services.obs.removeObserver(doNextStep, InspectorUI.INSPECTOR_NOTIFICATIONS.EDITOR_OPENED, false);
+  Services.obs.removeObserver(doNextStep, InspectorUI.INSPECTOR_NOTIFICATIONS.EDITOR_CLOSED, false);
+  Services.obs.removeObserver(doNextStep, InspectorUI.INSPECTOR_NOTIFICATIONS.EDITOR_SAVED, false);
   doc = div = null;
   InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
diff --git a/browser/devtools/highlighter/test/browser_inspector_initialization.js b/browser/devtools/highlighter/test/browser_inspector_initialization.js
index 4bffe770c27..e56cdfaeeb9 100644
--- a/browser/devtools/highlighter/test/browser_inspector_initialization.js
+++ b/browser/devtools/highlighter/test/browser_inspector_initialization.js
@@ -95,22 +95,34 @@ function treePanelTests()
 
   executeSoon(function() {
     InspectorUI.showSidebar();
+    document.getElementById(InspectorUI.getToolbarButtonId("styleinspector")).click();
   });
 }
 
 function stylePanelTests()
 {
   Services.obs.removeObserver(stylePanelTests, "StyleInspector-opened");
-  Services.obs.addObserver(runContextMenuTest,
-    InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
 
   ok(InspectorUI.isSidebarOpen, "Inspector Sidebar is open");
   ok(InspectorUI.stylePanel.cssHtmlTree, "Style Panel has a cssHtmlTree");
 
+  InspectorUI.ruleButton.click();
+  executeSoon(function() {
+    ruleViewTests();
+  });
+}
+
+function ruleViewTests()
+{
+  Services.obs.addObserver(runContextMenuTest,
+      InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
+
+  ok(InspectorUI.isRuleViewOpen(), "Rule View is open");
+  ok(InspectorUI.ruleView, "InspectorUI has a cssRuleView");
+
   executeSoon(function() {
     InspectorUI.closeInspectorUI();
   });
-
 }
 
 function runContextMenuTest()
@@ -193,6 +205,10 @@ function finishInspectorTests()
   ok(!InspectorUI.treePanel, "Inspector Tree Panel is closed");
   ok(!InspectorUI.inspecting, "Inspector is not inspecting");
   ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is closed");
+  ok(!InspectorUI.stylePanel, "Inspector Style Panel is gone");
+  ok(!InspectorUI.ruleView, "Inspector Rule View is gone");
+  is(InspectorUI.sidebarToolbar.children.length, 0, "No items in the Sidebar toolbar");
+  is(InspectorUI.sidebarDeck.children.length, 0, "No items in the Sidebar deck");
   ok(!InspectorUI.toolbar, "toolbar is hidden");
 
   gBrowser.removeCurrentTab();
diff --git a/browser/devtools/highlighter/test/browser_inspector_tab_switch.js b/browser/devtools/highlighter/test/browser_inspector_tab_switch.js
index 9b09def410c..840561caddc 100644
--- a/browser/devtools/highlighter/test/browser_inspector_tab_switch.js
+++ b/browser/devtools/highlighter/test/browser_inspector_tab_switch.js
@@ -62,6 +62,7 @@ function inspectorUIOpen1()
   // Make sure the inspector is open.
   ok(InspectorUI.inspecting, "Inspector is highlighting");
   ok(!InspectorUI.treePanel.isOpen(), "Inspector Tree Panel is not open");
+  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
   ok(!InspectorUI.store.isEmpty(), "InspectorUI.store is not empty");
   is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
 
@@ -88,6 +89,7 @@ function inspectorTabOpen2()
   // Make sure the inspector is closed.
   ok(!InspectorUI.inspecting, "Inspector is not highlighting");
   ok(!InspectorUI.treePanel, "Inspector Tree Panel is closed");
+  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
   is(InspectorUI.store.length, 1, "Inspector.store.length = 1");
 
   // Activate the inspector again.
@@ -147,6 +149,26 @@ function inspectorOpenTreePanelTab1()
   is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
   is(InspectorUI.selection, div, "selection matches the div element");
 
+  Services.obs.addObserver(inspectorSidebarStyleView1, "StyleInspector-opened", false);
+
+  executeSoon(function() {
+    InspectorUI.showSidebar();
+    InspectorUI.toolShow(InspectorUI.stylePanel.registrationObject);
+  });
+}
+
+function inspectorSidebarStyleView1()
+{
+  Services.obs.removeObserver(inspectorSidebarStyleView1, "StyleInspector-opened");
+  ok(InspectorUI.isSidebarOpen, "Inspector Sidebar is open");
+  ok(InspectorUI.stylePanel, "Inspector Has a Style Panel Instance");
+  InspectorUI.sidebarTools.forEach(function(aTool) {
+    let btn = document.getElementById(InspectorUI.getToolbarButtonId(aTool.id));
+    is(btn.hasAttribute("checked"),
+      (aTool == InspectorUI.stylePanel.registrationObject),
+      "Button " + btn.id + " has correct checked attribute");
+  });
+
   // Switch back to tab 2.
   Services.obs.addObserver(inspectorFocusTab2,
     InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
@@ -161,6 +183,7 @@ function inspectorFocusTab2()
   // Make sure the inspector is still open.
   ok(!InspectorUI.inspecting, "Inspector is not highlighting");
   ok(!InspectorUI.treePanel.isOpen(), "Inspector Tree Panel is not open");
+  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
   is(InspectorUI.store.length, 2, "Inspector.store.length is 2");
   isnot(InspectorUI.selection, div, "selection does not match the div element");
 
@@ -180,6 +203,15 @@ function inspectorSecondFocusTab1()
   is(InspectorUI.store.length, 2, "Inspector.store.length = 2");
   is(InspectorUI.selection, div, "selection matches the div element");
 
+  ok(InspectorUI.isSidebarOpen, "Inspector Sidebar is open");
+  ok(InspectorUI.stylePanel, "Inspector Has a Style Panel Instance");
+  InspectorUI.sidebarTools.forEach(function(aTool) {
+    let btn = document.getElementById(InspectorUI.getToolbarButtonId(aTool.id));
+    is(btn.hasAttribute("checked"),
+      (aTool == InspectorUI.stylePanel.registrationObject),
+      "Button " + btn.id + " has correct checked attribute");
+  });
+
   // Switch back to tab 2.
   Services.obs.addObserver(inspectorSecondFocusTab2,
     InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
@@ -194,6 +226,8 @@ function inspectorSecondFocusTab2()
   // Make sure the inspector is still open.
   ok(!InspectorUI.inspecting, "Inspector is not highlighting");
   ok(!InspectorUI.treePanel.isOpen(), "Inspector Tree Panel is not open");
+  ok(!InspectorUI.isSidebarOpen, "Inspector Sidebar is not open");
+
   is(InspectorUI.store.length, 2, "Inspector.store.length is 2");
   isnot(InspectorUI.selection, div, "selection does not match the div element");
 
diff --git a/browser/devtools/jar.mn b/browser/devtools/jar.mn
index 772bb510a53..7fca7adc924 100644
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -3,8 +3,8 @@ browser.jar:
     content/browser/NetworkPanel.xhtml            (webconsole/NetworkPanel.xhtml)
 *   content/browser/scratchpad.xul                (scratchpad/scratchpad.xul)
 *   content/browser/scratchpad.js                 (scratchpad/scratchpad.js)
-    content/browser/csshtmltree.xhtml             (styleinspector/csshtmltree.xhtml)
-    content/browser/devtools/cssruleview.xhtml    (styleinspector/cssruleview.xhtml)
+    content/browser/devtools/csshtmltree.xul      (styleinspector/csshtmltree.xul)
+    content/browser/devtools/cssruleview.xul      (styleinspector/cssruleview.xul)
     content/browser/devtools/styleinspector.css   (styleinspector/styleinspector.css)
     content/browser/orion.js                      (sourceeditor/orion/orion.js)
     content/browser/orion.css                     (sourceeditor/orion/orion.css)
diff --git a/browser/devtools/scratchpad/scratchpad.js b/browser/devtools/scratchpad/scratchpad.js
index e786077f197..bde98b9e87d 100644
--- a/browser/devtools/scratchpad/scratchpad.js
+++ b/browser/devtools/scratchpad/scratchpad.js
@@ -798,6 +798,8 @@ var Scratchpad = {
    */
   onEditPopupShowing: function SP_onEditPopupShowing()
   {
+    goUpdateGlobalEditMenuItems();
+
     let undo = document.getElementById("sp-cmd-undo");
     undo.setAttribute("disabled", !this.editor.canUndo());
 
diff --git a/browser/devtools/scratchpad/scratchpad.xul b/browser/devtools/scratchpad/scratchpad.xul
index 4e49425c30d..3eca6bd3e52 100644
--- a/browser/devtools/scratchpad/scratchpad.xul
+++ b/browser/devtools/scratchpad/scratchpad.xul
@@ -290,7 +290,8 @@
 </menubar>
 
 <popupset id="scratchpad-popups">
-  <menupopup id="scratchpad-text-popup">
+  <menupopup id="scratchpad-text-popup"
+             onpopupshowing="goUpdateGlobalEditMenuItems()">
     <menuitem id="menu_cut"/>
     <menuitem id="menu_copy"/>
     <menuitem id="menu_paste"/>
diff --git a/browser/devtools/scratchpad/test/Makefile.in b/browser/devtools/scratchpad/test/Makefile.in
index 07298aff60b..ea528144295 100644
--- a/browser/devtools/scratchpad/test/Makefile.in
+++ b/browser/devtools/scratchpad/test/Makefile.in
@@ -56,6 +56,7 @@ _BROWSER_TEST_FILES = \
 		browser_scratchpad_open.js \
 		browser_scratchpad_restore.js \
 		browser_scratchpad_bug_679467_falsy.js \
+		browser_scratchpad_bug_699130_edit_ui_updates.js \
 
 libs:: $(_BROWSER_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_bug_699130_edit_ui_updates.js b/browser/devtools/scratchpad/test/browser_scratchpad_bug_699130_edit_ui_updates.js
new file mode 100644
index 00000000000..b8f08496fb3
--- /dev/null
+++ b/browser/devtools/scratchpad/test/browser_scratchpad_bug_699130_edit_ui_updates.js
@@ -0,0 +1,193 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+Cu.import("resource:///modules/source-editor.jsm");
+
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
+    gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
+
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", function onScratchpadLoad() {
+      gScratchpadWindow.removeEventListener("load", onScratchpadLoad, false);
+      waitForFocus(runTests, gScratchpadWindow);
+    }, false);
+  }, true);
+
+  content.location = "data:text/html,test Edit menu updates Scratchpad - bug 699130";
+}
+
+function runTests()
+{
+  let sp = gScratchpadWindow.Scratchpad;
+  let doc = gScratchpadWindow.document;
+  let winUtils = gScratchpadWindow.QueryInterface(Ci.nsIInterfaceRequestor).
+                 getInterface(Ci.nsIDOMWindowUtils);
+  let OS = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
+
+  info("will test the Edit menu");
+
+  let pass = 0;
+
+  sp.setText("bug 699130: hello world! (edit menu)");
+
+  let editMenu = doc.getElementById("sp-edit-menu");
+  ok(editMenu, "the Edit menu");
+  let menubar = editMenu.parentNode;
+  ok(menubar, "menubar found");
+
+  let editMenuIndex = -1;
+  for (let i = 0; i < menubar.children.length; i++) {
+    if (menubar.children[i] === editMenu) {
+      editMenuIndex = i;
+      break;
+    }
+  }
+  isnot(editMenuIndex, -1, "Edit menu index is correct");
+
+  let menuPopup = editMenu.menupopup;
+  ok(menuPopup, "the Edit menupopup");
+  let cutItem = doc.getElementById("sp-menu-cut");
+  ok(cutItem, "the Cut menuitem");
+  let pasteItem = doc.getElementById("sp-menu-paste");
+  ok(pasteItem, "the Paste menuitem");
+
+  let anchor = doc.documentElement;
+  let isContextMenu = false;
+
+  let openMenu = function(aX, aY, aCallback) {
+    if (!editMenu || OS != "Darwin") {
+      menuPopup.addEventListener("popupshown", function onPopupShown() {
+        menuPopup.removeEventListener("popupshown", onPopupShown, false);
+        executeSoon(aCallback);
+      }, false);
+    }
+
+    executeSoon(function() {
+      if (editMenu) {
+        if (OS == "Darwin") {
+          winUtils.forceUpdateNativeMenuAt(editMenuIndex);
+          executeSoon(aCallback);
+        } else {
+          editMenu.open = true;
+        }
+      } else {
+        menuPopup.openPopup(anchor, "overlap", aX, aY, isContextMenu, false);
+      }
+    });
+  };
+
+  let closeMenu = function(aCallback) {
+    if (!editMenu || OS != "Darwin") {
+      menuPopup.addEventListener("popuphidden", function onPopupHidden() {
+        menuPopup.removeEventListener("popuphidden", onPopupHidden, false);
+        executeSoon(aCallback);
+      }, false);
+    }
+
+    executeSoon(function() {
+      if (editMenu) {
+        if (OS == "Darwin") {
+          winUtils.forceUpdateNativeMenuAt(editMenuIndex);
+          executeSoon(aCallback);
+        } else {
+          editMenu.open = false;
+        }
+      } else {
+        menuPopup.hidePopup();
+      }
+    });
+  };
+
+  let firstShow = function() {
+    ok(cutItem.hasAttribute("disabled"), "cut menuitem is disabled");
+    closeMenu(firstHide);
+  };
+
+  let firstHide = function() {
+    sp.selectRange(0, 10);
+    openMenu(11, 11, showAfterSelect);
+  };
+
+  let showAfterSelect = function() {
+    ok(!cutItem.hasAttribute("disabled"), "cut menuitem is enabled after select");
+    closeMenu(hideAfterSelect);
+  };
+
+  let hideAfterSelect = function() {
+    sp.editor.addEventListener(SourceEditor.EVENTS.TEXT_CHANGED, onCut);
+    EventUtils.synthesizeKey("x", {accelKey: true}, gScratchpadWindow);
+  };
+
+  let onCut = function() {
+    sp.editor.removeEventListener(SourceEditor.EVENTS.TEXT_CHANGED, onCut);
+    openMenu(12, 12, showAfterCut);
+  };
+
+  let showAfterCut = function() {
+    ok(cutItem.hasAttribute("disabled"), "cut menuitem is disabled after cut");
+    ok(!pasteItem.hasAttribute("disabled"), "paste menuitem is enabled after cut");
+    closeMenu(hideAfterCut);
+  };
+
+  let hideAfterCut = function() {
+    sp.editor.addEventListener(SourceEditor.EVENTS.TEXT_CHANGED, onPaste);
+    EventUtils.synthesizeKey("v", {accelKey: true}, gScratchpadWindow);
+  };
+
+  let onPaste = function() {
+    sp.editor.removeEventListener(SourceEditor.EVENTS.TEXT_CHANGED, onPaste);
+    openMenu(13, 13, showAfterPaste);
+  };
+
+  let showAfterPaste = function() {
+    ok(cutItem.hasAttribute("disabled"), "cut menuitem is disabled after paste");
+    ok(!pasteItem.hasAttribute("disabled"), "paste menuitem is enabled after paste");
+    closeMenu(hideAfterPaste);
+  };
+
+  let hideAfterPaste = function() {
+    if (pass == 0) {
+      pass++;
+      testContextMenu();
+    } else {
+      finishTest();
+    }
+  };
+
+  let testContextMenu = function() {
+    info("will test the context menu");
+
+    editMenu = null;
+    isContextMenu = true;
+
+    menuPopup = doc.getElementById("scratchpad-text-popup");
+    ok(menuPopup, "the context menupopup");
+    cutItem = doc.getElementById("menu_cut");
+    ok(cutItem, "the Cut menuitem");
+    pasteItem = doc.getElementById("menu_paste");
+    ok(pasteItem, "the Paste menuitem");
+
+    sp.setText("bug 699130: hello world! (context menu)");
+    openMenu(10, 10, firstShow);
+  };
+
+  let finishTest = function() {
+    gScratchpadWindow.close();
+    gScratchpadWindow = null;
+    gBrowser.removeCurrentTab();
+    finish();
+  };
+
+  openMenu(10, 10, firstShow);
+}
diff --git a/browser/devtools/sourceeditor/orion/README b/browser/devtools/sourceeditor/orion/README
index 0b3cdb75962..7459f63fc7e 100644
--- a/browser/devtools/sourceeditor/orion/README
+++ b/browser/devtools/sourceeditor/orion/README
@@ -22,6 +22,9 @@ Orion version: git clone from 2011-10-26
   + patch for Eclipse Bug 362428 - _getXToOffset() throws:
     https://github.com/mihaisucan/orion.client/tree/bug-362428
       see https://bugs.eclipse.org/bugs/show_bug.cgi?id=362428
+  + patch for Eclipse Bug 362835 - Pasted HTML shows twice:
+    https://github.com/mihaisucan/orion.client/tree/bug-362835
+      see https://bugs.eclipse.org/bugs/show_bug.cgi?id=362835
 
 # License
 
diff --git a/browser/devtools/sourceeditor/orion/orion.js b/browser/devtools/sourceeditor/orion/orion.js
index 1dbfdcd93f9..1a304615b0d 100644
--- a/browser/devtools/sourceeditor/orion/orion.js
+++ b/browser/devtools/sourceeditor/orion/orion.js
@@ -1952,7 +1952,7 @@ if (typeof window !== "undefined" && typeof window.define !== "undefined") {
  * Contributors: 
  *		Felipe Heidrich (IBM Corporation) - initial API and implementation
  *		Silenio Quarti (IBM Corporation) - initial API and implementation
- *		Mihai Sucan (Mozilla Foundation) - fix for Bug#334583 Bug#348471 Bug#349485 Bug#350595 Bug#360726 Bug#361180 Bug#358623 Bug#362286 Bug#362107 Bug#362428
+ *		Mihai Sucan (Mozilla Foundation) - fix for Bug#334583 Bug#348471 Bug#349485 Bug#350595 Bug#360726 Bug#361180 Bug#358623 Bug#362286 Bug#362107 Bug#362428 Bug#362835
  ******************************************************************************/
 
 /*global window document navigator setTimeout clearTimeout XMLHttpRequest define */
@@ -5673,7 +5673,10 @@ orion.textview.TextView = (function() {
 				this._ignorePaste = true;
 				try {
 					result = document.execCommand("paste", false, null);
-				} catch (ex) {}
+				} catch (ex) {
+					// Firefox can throw even when execCommand() works, see bug 362835
+					result = clipboardDiv.childNodes.length > 1 || clipboardDiv.firstChild && clipboardDiv.firstChild.childNodes.length > 0;
+				}
 				this._ignorePaste = false;
 				if (!result) {
 					/*
diff --git a/browser/devtools/sourceeditor/test/browser_bug684862_paste_html.js b/browser/devtools/sourceeditor/test/browser_bug684862_paste_html.js
index 49938be17cc..6e7d1da54a7 100644
--- a/browser/devtools/sourceeditor/test/browser_bug684862_paste_html.js
+++ b/browser/devtools/sourceeditor/test/browser_bug684862_paste_html.js
@@ -73,7 +73,10 @@ function editorLoaded()
     let text = editor.getText();
     ok(text, "editor has content after paste");
 
-    isnot(text.indexOf("foobarBug684862"), -1, "editor content is correct");
+    let pos = text.indexOf("foobarBug684862");
+    isnot(pos, -1, "editor content is correct");
+    // Test for bug 699541 - Pasted HTML shows twice in Orion.
+    is(text.lastIndexOf("foobarBug684862"), pos, "editor content is correct (no duplicate)");
 
     executeSoon(function() {
       editor.setCaretOffset(4);
@@ -82,7 +85,7 @@ function editorLoaded()
 
       text = editor.getText();
 
-      isnot(text.indexOf("foobarBug684862"), -1,
+      is(text.indexOf("foobarBug684862"), pos + 1,
             "editor content is correct after navigation");
       is(editor.getCaretOffset(), 6, "caret location");
 
diff --git a/browser/devtools/styleinspector/CssHtmlTree.jsm b/browser/devtools/styleinspector/CssHtmlTree.jsm
index 42301bd104e..4c7db92792b 100644
--- a/browser/devtools/styleinspector/CssHtmlTree.jsm
+++ b/browser/devtools/styleinspector/CssHtmlTree.jsm
@@ -69,7 +69,7 @@ function CssHtmlTree(aStyleInspector)
   this.getRTLAttr = this.win.getComputedStyle(this.win.gBrowser).direction;
   this.propertyViews = [];
 
-  // The document in which we display the results (csshtmltree.xhtml).
+  // The document in which we display the results (csshtmltree.xul).
   this.styleDocument = this.styleWin.contentWindow.document;
 
   // Nodes used in templating
@@ -81,6 +81,9 @@ function CssHtmlTree(aStyleInspector)
   this.templateProperty = this.styleDocument.getElementById("templateProperty");
   this.panel = aStyleInspector.panel;
 
+  // No results text.
+  this.noResults = this.styleDocument.getElementById("noResults");
+
   // The element that we're inspecting, and the document that it comes from.
   this.viewedElement = null;
   this.createStyleViews();
@@ -133,20 +136,30 @@ XPCOMUtils.defineLazyGetter(CssHtmlTree, "_strings", function() Services.strings
         .createBundle("chrome://browser/locale/devtools/styleinspector.properties"));
 
 CssHtmlTree.prototype = {
+  // Cache the list of properties that have matched and unmatched properties.
+  _matchedProperties: null,
+  _unmatchedProperties: null,
+
   htmlComplete: false,
 
   // Used for cancelling timeouts in the style filter.
-  filterChangedTimeout: null,
+  _filterChangedTimeout: null,
 
   // The search filter
   searchField: null,
-  
+
   // Reference to the "Only user Styles" checkbox.
   onlyUserStylesCheckbox: null,
 
   // Holds the ID of the panelRefresh timeout.
   _panelRefreshTimeout: null,
 
+  // Toggle for zebra striping
+  _darkStripe: true,
+
+  // Number of visible properties
+  numVisibleProperties: 0,
+
   get showOnlyUserStyles()
   {
     return this.onlyUserStylesCheckbox.checked;
@@ -159,17 +172,19 @@ CssHtmlTree.prototype = {
    */
   highlight: function CssHtmlTree_highlight(aElement)
   {
-    if (this.viewedElement == aElement) {
-      return;
-    }
-
     this.viewedElement = aElement;
+    this._unmatchedProperties = null;
+    this._matchedProperties = null;
 
     CssHtmlTree.processTemplate(this.templatePath, this.path, this);
 
     if (this.htmlComplete) {
       this.refreshPanel();
     } else {
+      if (this._panelRefreshTimeout) {
+        this.win.clearTimeout(this._panelRefreshTimeout);
+      }
+
       CssHtmlTree.processTemplate(this.templateRoot, this.root, this);
 
       // We use a setTimeout loop to display the properties in batches of 15 at a
@@ -185,21 +200,27 @@ CssHtmlTree.prototype = {
             let propView = new PropertyView(this, name);
             CssHtmlTree.processTemplate(this.templateProperty,
               this.propertyContainer, propView, true);
-            propView.refreshMatchedSelectors();
-            propView.refreshUnmatchedSelectors();
+            if (propView.visible) {
+              this.numVisibleProperties++;
+            }
+            propView.refreshAllSelectors();
             this.propertyViews.push(propView);
           }
           if (i < max) {
             // There are still some properties to display. We loop here to display
             // the next batch of 15.
-            this.win.setTimeout(displayProperties.bind(this), 50);
+            this._panelRefreshTimeout =
+              this.win.setTimeout(displayProperties.bind(this), 15);
           } else {
             this.htmlComplete = true;
+            this._panelRefreshTimeout = null;
+            this.noResults.hidden = this.numVisibleProperties > 0;
             Services.obs.notifyObservers(null, "StyleInspector-populated", null);
           }
         }
       }
-      this.win.setTimeout(displayProperties.bind(this), 50);
+      this._panelRefreshTimeout =
+        this.win.setTimeout(displayProperties.bind(this), 15);
     }
   },
 
@@ -208,7 +229,17 @@ CssHtmlTree.prototype = {
    */
   refreshPanel: function CssHtmlTree_refreshPanel()
   {
-    this.win.clearTimeout(this._panelRefreshTimeout);
+    if (this._panelRefreshTimeout) {
+      this.win.clearTimeout(this._panelRefreshTimeout);
+    }
+
+    this.noResults.hidden = true;
+
+    // Reset visible property count
+    this.numVisibleProperties = 0;
+
+    // Reset zebra striping.
+    this._darkStripe = true;
 
     // We use a setTimeout loop to display the properties in batches of 15 at a
     // time. This results in a perceptibly more responsive UI.
@@ -223,12 +254,14 @@ CssHtmlTree.prototype = {
       if (i < max) {
         // There are still some property views to refresh. We loop here to
         // display the next batch of 15.
-        this._panelRefreshTimeout = this.win.setTimeout(refreshView.bind(this), 0);
+        this._panelRefreshTimeout = this.win.setTimeout(refreshView.bind(this), 15);
       } else {
+        this._panelRefreshTimeout = null;
+        this.noResults.hidden = this.numVisibleProperties > 0;
         Services.obs.notifyObservers(null, "StyleInspector-populated", null);
       }
     }
-    this._panelRefreshTimeout = this.win.setTimeout(refreshView.bind(this), 0);
+    this._panelRefreshTimeout = this.win.setTimeout(refreshView.bind(this), 15);
   },
 
   /**
@@ -254,13 +287,13 @@ CssHtmlTree.prototype = {
   {
     let win = this.styleWin.contentWindow;
 
-    if (this.filterChangedTimeout) {
-      win.clearTimeout(this.filterChangedTimeout);
-      this.filterChangeTimeout = null;
+    if (this._filterChangedTimeout) {
+      win.clearTimeout(this._filterChangedTimeout);
     }
 
-    this.filterChangedTimeout = win.setTimeout(function() {
+    this._filterChangedTimeout = win.setTimeout(function() {
       this.refreshPanel();
+      this._filterChangeTimeout = null;
     }.bind(this), FILTER_CHANGED_TIMEOUT);
   },
 
@@ -275,6 +308,7 @@ CssHtmlTree.prototype = {
    */
   onlyUserStylesChanged: function CssHtmltree_onlyUserStylesChanged(aEvent)
   {
+    this._matchedProperties = null;
     this.cssLogic.sourceFilter = this.showOnlyUserStyles ?
                                  CssLogic.FILTER.ALL :
                                  CssLogic.FILTER.UA;
@@ -305,8 +339,8 @@ CssHtmlTree.prototype = {
     CssHtmlTree.propertyNames = [];
 
     // Here we build and cache a list of css properties supported by the browser
-    // We could use any element but let's use the main document's body
-    let styles = this.styleWin.contentWindow.getComputedStyle(this.styleDocument.body);
+    // We could use any element but let's use the main document's root element
+    let styles = this.styleWin.contentWindow.getComputedStyle(this.styleDocument.documentElement);
     let mozProps = [];
     for (let i = 0, numStyles = styles.length; i < numStyles; i++) {
       let prop = styles.item(i);
@@ -322,6 +356,56 @@ CssHtmlTree.prototype = {
       mozProps.sort());
   },
 
+  /**
+   * Get a list of properties that have matched selectors.
+   *
+   * @return {object} the object maps property names (keys) to booleans (values)
+   * that tell if the given property has matched selectors or not.
+   */
+  get matchedProperties()
+  {
+    if (!this._matchedProperties) {
+      this._matchedProperties =
+        this.cssLogic.hasMatchedSelectors(CssHtmlTree.propertyNames);
+    }
+    return this._matchedProperties;
+  },
+
+  /**
+   * Check if a property has unmatched selectors. Result is cached.
+   *
+   * @param {string} aProperty the name of the property you want to check.
+   * @return {boolean} true if the property has unmatched selectors, false
+   * otherwise.
+   */
+  hasUnmatchedSelectors: function CssHtmlTree_hasUnmatchedSelectors(aProperty)
+  {
+    // Initially check all of the properties that return false for
+    // hasMatchedSelectors(). This speeds-up the UI.
+    if (!this._unmatchedProperties) {
+      let properties = [];
+      CssHtmlTree.propertyNames.forEach(function(aName) {
+        if (!this.matchedProperties[aName]) {
+          properties.push(aName);
+        }
+      }, this);
+
+      if (properties.indexOf(aProperty) == -1) {
+        properties.push(aProperty);
+      }
+
+      this._unmatchedProperties = this.cssLogic.hasUnmatchedSelectors(properties);
+    }
+
+    // Lazy-get the result for properties we do not have cached.
+    if (!(aProperty in this._unmatchedProperties)) {
+      let result = this.cssLogic.hasUnmatchedSelectors([aProperty]);
+      this._unmatchedProperties[aProperty] = result[aProperty];
+    }
+
+    return this._unmatchedProperties[aProperty];
+  },
+
   /**
    * Destructor for CssHtmlTree.
    */
@@ -329,16 +413,20 @@ CssHtmlTree.prototype = {
   {
     delete this.viewedElement;
 
+    // Remove event listeners
+    this.onlyUserStylesCheckbox.removeEventListener("command",
+      this.onlyUserStylesChanged);
+    this.searchField.removeEventListener("command", this.filterChanged);
+
     // Nodes used in templating
     delete this.root;
     delete this.path;
-    delete this.templateRoot;
     delete this.templatePath;
     delete this.propertyContainer;
     delete this.templateProperty;
     delete this.panel;
 
-    // The document in which we display the results (csshtmltree.xhtml).
+    // The document in which we display the results (csshtmltree.xul).
     delete this.styleDocument;
 
     // The element that we're inspecting, and the document that it comes from.
@@ -368,13 +456,15 @@ function PropertyView(aTree, aName)
   this.link = "https://developer.mozilla.org/en/CSS/" + aName;
 
   this.templateMatchedSelectors = aTree.styleDocument.getElementById("templateMatchedSelectors");
-  this.templateUnmatchedSelectors = aTree.styleDocument.getElementById("templateUnmatchedSelectors");
 }
 
 PropertyView.prototype = {
   // The parent element which contains the open attribute
   element: null,
 
+  // Property header node
+  propertyHeader: null,
+
   // Destination for property values
   valueNode: null,
 
@@ -384,29 +474,23 @@ PropertyView.prototype = {
   // Are unmatched rules expanded?
   unmatchedExpanded: false,
 
+  // Unmatched selector table
+  unmatchedSelectorTable: null,
+
   // Matched selector container
   matchedSelectorsContainer: null,
 
-  // Unmatched selector container
-  unmatchedSelectorsContainer: null,
-
   // Matched selector expando
   matchedExpander: null,
 
   // Unmatched selector expando
   unmatchedExpander: null,
 
-  // Container for X matched selectors
-  matchedSelectorsTitleNode: null,
+  // Unmatched selector container
+  unmatchedSelectorsContainer: null,
 
-  // Container for X unmatched selectors
-  unmatchedSelectorsTitleNode: null,
-
-  // Matched selectors table
-  matchedSelectorTable: null,
-
-  // Unmatched selectors table
-  unmatchedSelectorTable: null,
+  // Unmatched title block
+  unmatchedTitleBlock: null,
 
   // Cache for matched selector views
   _matchedSelectorViews: null,
@@ -441,7 +525,7 @@ PropertyView.prototype = {
    */
   get hasMatchedSelectors()
   {
-    return this.propertyInfo.hasMatchedSelectors();
+    return this.name in this.tree.matchedProperties;
   },
 
   /**
@@ -449,7 +533,7 @@ PropertyView.prototype = {
    */
   get hasUnmatchedSelectors()
   {
-    return this.propertyInfo.hasUnmatchedSelectors();
+    return this.name in this.tree.hasUnmatchedSelectors;
   },
 
   /**
@@ -472,10 +556,18 @@ PropertyView.prototype = {
 
   /**
    * Returns the className that should be assigned to the propertyView.
+   *
+   * @return string
    */
   get className()
   {
-    return this.visible ? "property-view" : "property-view-hidden";
+    if (this.visible) {
+      this.tree._darkStripe = !this.tree._darkStripe;
+      let darkValue = this.tree._darkStripe ?
+                      "property-view darkrow" : "property-view";
+      return darkValue;
+    }
+    return "property-view-hidden";
   },
 
   /**
@@ -494,18 +586,14 @@ PropertyView.prototype = {
     if (!this.tree.viewedElement || !this.visible) {
       this.valueNode.innerHTML = "";
       this.matchedSelectorsContainer.hidden = true;
-      this.unmatchedSelectorsContainer.hidden = true;
-      this.matchedSelectorTable.innerHTML = "";
-      this.unmatchedSelectorTable.innerHTML = "";
+      this.matchedSelectorsContainer.innerHTML = "";
       this.matchedExpander.removeAttribute("open");
-      this.unmatchedExpander.removeAttribute("open");
       return;
     }
 
+    this.tree.numVisibleProperties++;
     this.valueNode.innerHTML = this.propertyInfo.value;
-    
-    this.refreshMatchedSelectors();
-    this.refreshUnmatchedSelectors();
+    this.refreshAllSelectors();
   },
 
   /**
@@ -516,12 +604,18 @@ PropertyView.prototype = {
     let hasMatchedSelectors = this.hasMatchedSelectors;
     this.matchedSelectorsContainer.hidden = !hasMatchedSelectors;
 
+    if (hasMatchedSelectors) {
+      this.propertyHeader.classList.add("expandable");
+    } else {
+      this.propertyHeader.classList.remove("expandable");
+    }
+
     if (this.matchedExpanded && hasMatchedSelectors) {
       CssHtmlTree.processTemplate(this.templateMatchedSelectors,
-        this.matchedSelectorTable, this);
+        this.matchedSelectorsContainer, this);
       this.matchedExpander.setAttribute("open", "");
     } else {
-      this.matchedSelectorTable.innerHTML = "";
+      this.matchedSelectorsContainer.innerHTML = "";
       this.matchedExpander.removeAttribute("open");
     }
   },
@@ -531,17 +625,44 @@ PropertyView.prototype = {
    */
   refreshUnmatchedSelectors: function PropertyView_refreshUnmatchedSelectors()
   {
-    let hasUnmatchedSelectors = this.hasUnmatchedSelectors;
-    this.unmatchedSelectorsContainer.hidden = !hasUnmatchedSelectors;
+    let hasMatchedSelectors = this.hasMatchedSelectors;
 
-    if (this.unmatchedExpanded && hasUnmatchedSelectors) {
-      CssHtmlTree.processTemplate(this.templateUnmatchedSelectors,
-          this.unmatchedSelectorTable, this);
-      this.unmatchedExpander.setAttribute("open", "");
+    this.unmatchedSelectorTable.hidden = !this.unmatchedExpanded;
+
+    if (hasMatchedSelectors) {
+      this.unmatchedSelectorsContainer.hidden = !this.matchedExpanded ||
+        !this.hasUnmatchedSelectors;
+      this.unmatchedTitleBlock.hidden = false;
     } else {
-      this.unmatchedSelectorTable.innerHTML = "";
-      this.unmatchedExpander.removeAttribute("open");
+      this.unmatchedSelectorsContainer.hidden = !this.unmatchedExpanded;
+      this.unmatchedTitleBlock.hidden = true;
     }
+
+    if (this.unmatchedExpanded && this.hasUnmatchedSelectors) {
+      CssHtmlTree.processTemplate(this.templateUnmatchedSelectors,
+        this.unmatchedSelectorTable, this);
+      if (!hasMatchedSelectors) {
+        this.matchedExpander.setAttribute("open", "");
+        this.unmatchedSelectorTable.classList.add("only-unmatched");
+      } else {
+        this.unmatchedExpander.setAttribute("open", "");
+        this.unmatchedSelectorTable.classList.remove("only-unmatched");
+      }
+    } else {
+      if (!hasMatchedSelectors) {
+        this.matchedExpander.removeAttribute("open");
+      }
+      this.unmatchedExpander.removeAttribute("open");
+      this.unmatchedSelectorTable.innerHTML = "";
+    }
+  },
+
+  /**
+   * Refresh the panel matched and unmatched rules
+   */
+  refreshAllSelectors: function PropertyView_refreshAllSelectors()
+  {
+    this.refreshMatchedSelectors();
   },
 
   /**
@@ -580,12 +701,18 @@ PropertyView.prototype = {
 
   /**
    * The action when a user expands matched selectors.
+   *
+   * @param {Event} aEvent Used to determine the class name of the targets click
+   * event. If the class name is "helplink" then the event is allowed to bubble
+   * to the mdn link icon.
    */
-  matchedSelectorsClick: function PropertyView_matchedSelectorsClick(aEvent)
+  propertyHeaderClick: function PropertyView_propertyHeaderClick(aEvent)
   {
-    this.matchedExpanded = !this.matchedExpanded;
-    this.refreshMatchedSelectors();
-    aEvent.preventDefault();
+    if (aEvent.target.className != "helplink") {
+      this.matchedExpanded = !this.matchedExpanded;
+      this.refreshAllSelectors();
+      aEvent.preventDefault();
+    }
   },
 
   /**
@@ -597,6 +724,15 @@ PropertyView.prototype = {
     this.refreshUnmatchedSelectors();
     aEvent.preventDefault();
   },
+
+  /**
+   * The action when a user clicks on the MDN help link for a property.
+   */
+  mdnLinkClick: function PropertyView_mdnLinkClick(aEvent)
+  {
+    this.tree.win.openUILinkIn(this.link, "tab");
+    aEvent.preventDefault();
+  },
 };
 
 /**
diff --git a/browser/devtools/styleinspector/CssLogic.jsm b/browser/devtools/styleinspector/CssLogic.jsm
index c81c74df237..278b915b5f5 100644
--- a/browser/devtools/styleinspector/CssLogic.jsm
+++ b/browser/devtools/styleinspector/CssLogic.jsm
@@ -151,6 +151,7 @@ CssLogic.prototype = {
   // in processUnmatchedSelectors().
   _matchId: 0,
 
+  _matchedRules: null,
   _matchedSelectors: null,
   _unmatchedSelectors: null,
 
@@ -166,6 +167,7 @@ CssLogic.prototype = {
     this._sheetIndex = 0;
     this._sheets = {};
     this._sheetsCached = false;
+    this._matchedRules = null;
     this._matchedSelectors = null;
     this._unmatchedSelectors = null;
   },
@@ -200,6 +202,7 @@ CssLogic.prototype = {
       this._propertyInfos = {};
     }
 
+    this._matchedRules = null;
     this._matchedSelectors = null;
     this._unmatchedSelectors = null;
     let win = this.viewedDocument.defaultView;
@@ -242,6 +245,7 @@ CssLogic.prototype = {
         aValue == CssLogic.FILTER.UA);
 
     if (needFullUpdate) {
+      this._matchedRules = null;
       this._matchedSelectors = null;
       this._unmatchedSelectors = null;
       this._propertyInfos = {};
@@ -289,7 +293,7 @@ CssLogic.prototype = {
     // styleSheets isn't an array, but forEach can work on it anyway
     Array.prototype.forEach.call(this.viewedDocument.styleSheets,
         this._cacheSheet, this);
-    
+
     this._sheetsCached = true;
   },
 
@@ -309,19 +313,19 @@ CssLogic.prototype = {
     }
 
     // Only work with stylesheets that have their media allowed.
-    if (!CssLogic.sheetMediaAllowed(aDomSheet)) {
+    if (!this.mediaMatches(aDomSheet)) {
       return;
     }
 
     // Cache the sheet.
-    let cssSheet = this.getSheet(aDomSheet, false, this._sheetIndex++);
+    let cssSheet = this.getSheet(aDomSheet, this._sheetIndex++);
     if (cssSheet._passId != this._passId) {
       cssSheet._passId = this._passId;
 
       // Find import rules.
       Array.prototype.forEach.call(aDomSheet.cssRules, function(aDomRule) {
         if (aDomRule.type == Ci.nsIDOMCSSRule.IMPORT_RULE && aDomRule.styleSheet &&
-            CssLogic.sheetMediaAllowed(aDomRule)) {
+            this.mediaMatches(aDomRule)) {
           this._cacheSheet(aDomRule.styleSheet);
         }
       }, this);
@@ -355,20 +359,18 @@ CssLogic.prototype = {
    * otherwise the new CSSStyleSheet object is cached.
    *
    * @param {CSSStyleSheet} aDomSheet the CSSStyleSheet object you want.
-   * @param {boolean} aSystemSheet tells if the stylesheet is a browser-provided
-   * sheet or not.
    * @param {number} aIndex the index, within the document, of the stylesheet.
    *
    * @return {CssSheet} the CssSheet object for the given CSSStyleSheet object.
    */
-  getSheet: function CL_getSheet(aDomSheet, aSystemSheet, aIndex)
+  getSheet: function CL_getSheet(aDomSheet, aIndex)
   {
-    let cacheId = aSystemSheet ? "1" : "0";
+    let cacheId = "";
 
     if (aDomSheet.href) {
-      cacheId += aDomSheet.href;
+      cacheId = aDomSheet.href;
     } else if (aDomSheet.ownerNode && aDomSheet.ownerNode.ownerDocument) {
-      cacheId += aDomSheet.ownerNode.ownerDocument.location;
+      cacheId = aDomSheet.ownerNode.ownerDocument.location;
     }
 
     let sheet = null;
@@ -377,8 +379,10 @@ CssLogic.prototype = {
     if (cacheId in this._sheets) {
       for (let i = 0, numSheets = this._sheets[cacheId].length; i < numSheets; i++) {
         sheet = this._sheets[cacheId][i];
-        if (sheet.domSheet == aDomSheet) {
-          sheet.index = aIndex;
+        if (sheet.domSheet === aDomSheet) {
+          if (aIndex != -1) {
+            sheet.index = aIndex;
+          }
           sheetFound = true;
           break;
         }
@@ -390,8 +394,8 @@ CssLogic.prototype = {
         this._sheets[cacheId] = [];
       }
 
-      sheet = new CssSheet(this, aDomSheet, aSystemSheet, aIndex);
-      if (sheet.sheetAllowed && !aSystemSheet) {
+      sheet = new CssSheet(this, aDomSheet, aIndex);
+      if (sheet.sheetAllowed && !sheet.systemSheet) {
         this._ruleCount += sheet.ruleCount;
       }
 
@@ -486,77 +490,54 @@ CssLogic.prototype = {
       return;
     }
 
+    if (!this._matchedRules) {
+      this._buildMatchedRules();
+    }
+
     this._matchedSelectors = [];
     this._unmatchedSelectors = null;
     this._passId++;
-    this._matchId++;
 
-    let element = this.viewedElement;
-    let filter = this.sourceFilter;
-    let sheetIndex = 0;
-    let domRules = null;
-    do {
-      try {
-        domRules = this.domUtils.getCSSStyleRules(element);
-      } catch (ex) {
-        Services.console.
-            logStringMessage("CssLogic_processMatchedSelectors error: " + ex);
-        continue;
-      }
+    for (let i = 0; i < this._matchedRules.length; i++) {
+      let rule = this._matchedRules[i][0];
+      let status = this._matchedRules[i][1];
 
-      let status = (this.viewedElement == element) ?
-          CssLogic.STATUS.MATCHED : CssLogic.STATUS.PARENT_MATCH;
-
-      for (let i = 0, numRules = domRules.Count(); i < numRules; i++) {
-        let domRule = domRules.GetElementAt(i);
-        if (domRule.type !== Ci.nsIDOMCSSRule.STYLE_RULE) {
-          continue;
-        }
-
-        let domSheet = domRule.parentStyleSheet;
-        let systemSheet = CssLogic.isSystemStyleSheet(domSheet);
-        if (filter !== CssLogic.FILTER.UA && systemSheet) {
-          continue;
-        }
-
-        let sheet = this.getSheet(domSheet, systemSheet, sheetIndex);
-        let rule = sheet.getRule(domRule);
-
-        rule.selectors.forEach(function (aSelector) {
-          if (aSelector._matchId !== this._matchId &&
-              element.mozMatchesSelector(aSelector)) {
-            aSelector._matchId = this._matchId;
-            this._matchedSelectors.push([ aSelector, status ]);
-            if (aCallback) {
-              aCallback.call(aScope, aSelector, status);
-            }
+      rule.selectors.forEach(function (aSelector) {
+        if (aSelector._matchId !== this._matchId &&
+            (aSelector.elementStyle ||
+             this._selectorMatchesElement(aSelector))) {
+          aSelector._matchId = this._matchId;
+          this._matchedSelectors.push([ aSelector, status ]);
+          if (aCallback) {
+            aCallback.call(aScope, aSelector, status);
           }
-        }, this);
-
-        if (sheet._passId !== this._passId) {
-          sheetIndex++;
-          sheet._passId = this._passId;
         }
+      }, this);
 
-        if (rule._passId !== this._passId) {
-          rule._passId = this._passId;
-        }
-      }
+      rule._passId = this._passId;
+    }
+  },
 
-      // Add element.style information.
-      if (element.style.length > 0) {
-        let rule = new CssRule(null, { style: element.style }, element);
-        let selector = rule.selectors[0];
-        selector._matchId = this._matchId;
-
-        this._matchedSelectors.push([ selector, status ]);
-        if (aCallback) {
-          aCallback.call(aScope, selector, status);
-        }
-        rule._passId = this._passId;
+  /**
+   * Check if the given selector matches the highlighted element or any of its
+   * parents.
+   *
+   * @private
+   * @param {string} aSelector the selector string you want to check.
+   * @return {boolean} true if the given selector matches the highlighted
+   * element or any of its parents, otherwise false is returned.
+   */
+  _selectorMatchesElement: function CL__selectorMatchesElement(aSelector)
+  {
+    let element = this.viewedElement;
+    do {
+      if (element.mozMatchesSelector(aSelector)) {
+        return true;
       }
     } while ((element = element.parentNode) &&
-        element.nodeType === Ci.nsIDOMNode.ELEMENT_NODE);
+             element.nodeType === Ci.nsIDOMNode.ELEMENT_NODE);
+
+    return false;
   },
 
   /**
@@ -573,9 +554,6 @@ CssLogic.prototype = {
    */
   processUnmatchedSelectors: function CL_processUnmatchedSelectors(aCallback, aScope)
   {
-    if (!this._matchedSelectors) {
-      this.processMatchedSelectors();
-    }
     if (this._unmatchedSelectors) {
       if (aCallback) {
         this._unmatchedSelectors.forEach(aCallback, aScope);
@@ -583,17 +561,21 @@ CssLogic.prototype = {
       return;
     }
 
+    if (!this._matchedSelectors) {
+      this.processMatchedSelectors();
+    }
+
     this._unmatchedSelectors = [];
 
     this.forEachSheet(function (aSheet) {
       // We do not show unmatched selectors from system stylesheets
-      if (aSheet.systemSheet) {
+      if (aSheet.systemSheet || aSheet.disabled || !aSheet.mediaMatches) {
         return;
       }
 
       aSheet.forEachRule(function (aRule) {
         aRule.selectors.forEach(function (aSelector) {
-          if (aSelector._matchId != this._matchId) {
+          if (aSelector._matchId !== this._matchId) {
             this._unmatchedSelectors.push(aSelector);
             if (aCallback) {
               aCallback.call(aScope, aSelector);
@@ -607,88 +589,205 @@ CssLogic.prototype = {
   /**
    * Check if the highlighted element or it's parents have matched selectors.
    *
-   * @param {function} [aCallback] Simple callback method. If aCallback is
-   * provided then the domRules for each element in the loop are passed to
-   * the callback function. When the element has .style properties, the callback
-   * receives {style: element.style}. If the callback returns true then the
-   * element has matched rules, otherwise not.
-   * @return {Boolean} true if the current element or it's parents have
-   * matching CssSelector objects, false otherwise
+   * @param {array} aProperties The list of properties you want to check if they
+   * have matched selectors or not.
+   * @return {object} An object that tells for each property if it has matched
+   * selectors or not. Object keys are property names and values are booleans.
    */
-  hasMatchedSelectors: function CL_hasMatchedSelectors(aCallback)
+  hasMatchedSelectors: function CL_hasMatchedSelectors(aProperties)
+  {
+    if (!this._matchedRules) {
+      this._buildMatchedRules();
+    }
+
+    let result = {};
+
+    this._matchedRules.some(function(aValue) {
+      let rule = aValue[0];
+      aProperties = aProperties.filter(function(aProperty) {
+        if (rule.getPropertyValue(aProperty)) {
+          // We just need to find if a rule has this property while it matches
+          // the viewedElement (or its parents).
+          result[aProperty] = true;
+          return false;
+        }
+        return true; // Keep the property for the next rule.
+      });
+      return aProperties.length == 0;
+    }, this);
+
+    return result;
+  },
+
+  /**
+   * Build the array of matched rules for the currently highlighted element.
+   * The array will hold rules that match the viewedElement and its parents.
+   *
+   * @private
+   */
+  _buildMatchedRules: function CL__buildMatchedRules()
   {
     let domRules;
     let element = this.viewedElement;
-    let matched = false;
+    let filter = this.sourceFilter;
+    let sheetIndex = 0;
+
+    this._matchId++;
+    this._passId++;
+    this._matchedRules = [];
 
     do {
+      let status = this.viewedElement === element ?
+                   CssLogic.STATUS.MATCHED : CssLogic.STATUS.PARENT_MATCH;
+
       try {
         domRules = this.domUtils.getCSSStyleRules(element);
       } catch (ex) {
         Services.console.
-            logStringMessage("CssLogic_hasMatchedSelectors error: " + ex);
+          logStringMessage("CL__buildMatchedRules error: " + ex);
         continue;
       }
 
-      // Check if the are DOM rules that we can consider as matched rules
-      // (depending on the callback).
-      if (domRules.Count() && (!aCallback || aCallback(domRules))) {
-        matched = true;
+      for (let i = 0, n = domRules.Count(); i < n; i++) {
+        let domRule = domRules.GetElementAt(i);
+        if (domRule.type !== Ci.nsIDOMCSSRule.STYLE_RULE) {
+          continue;
+        }
+
+        let sheet = this.getSheet(domRule.parentStyleSheet, -1);
+        if (sheet._passId !== this._passId) {
+          sheet.index = sheetIndex++;
+          sheet._passId = this._passId;
+        }
+
+        if (filter !== CssLogic.FILTER.UA && sheet.systemSheet) {
+          continue;
+        }
+
+        let rule = sheet.getRule(domRule);
+        if (rule._passId === this._passId) {
+          continue;
+        }
+
+        rule._matchId = this._matchId;
+        rule._passId = this._passId;
+        this._matchedRules.push([rule, status]);
       }
 
-      // Check if the element has any element.style properties that we can
-      // consider as "matched" (depending on the callback).
-      if (element.style.length > 0 &&
-          (!aCallback || aCallback({style: element.style}))) {
-        matched = true;
-      }
 
-      if (matched) {
-        break;
+      // Add element.style information.
+      if (element.style.length > 0) {
+        let rule = new CssRule(null, { style: element.style }, element);
+        rule._matchId = this._matchId;
+        rule._passId = this._passId;
+        this._matchedRules.push([rule, status]);
       }
     } while ((element = element.parentNode) &&
-        element.nodeType === Ci.nsIDOMNode.ELEMENT_NODE);
-
-    return matched;
+              element.nodeType === Ci.nsIDOMNode.ELEMENT_NODE);
   },
 
   /**
    * Check if the highlighted element or it's parents have unmatched selectors.
    *
-   * @param {String} aProperty The CSS property to check against
-   * @return {Boolean} true if the current element or it's parents have
-   * unmatched CssSelector objects, false otherwise
+   * Please note that this method is far slower than hasMatchedSelectors()
+   * because it needs to do a lot more checks in the DOM.
+   *
+   * @param {array} aProperties The list of properties you want to check if they
+   * have unmatched selectors or not.
+   * @return {object} An object that tells for each property if it has unmatched
+   * selectors or not. Object keys are property names and values are booleans.
    */
-  hasUnmatchedSelectors: function CL_hasUnmatchedSelectors(aProperty)
+  hasUnmatchedSelectors: function CL_hasUnmatchedSelectors(aProperties)
   {
-    return this.forSomeSheets(function (aSheet) {
-      // We do not show unmatched selectors from system stylesheets
-      if (aSheet.systemSheet) {
+    if (!this._matchedRules) {
+      this._buildMatchedRules();
+    }
+
+    let result = {};
+
+    this.forSomeSheets(function (aSheet) {
+      if (aSheet.systemSheet || aSheet.disabled || !aSheet.mediaMatches) {
         return false;
       }
 
       return aSheet.forSomeRules(function (aRule) {
-        if (aRule.getPropertyValue(aProperty)) {
-          let element = this.viewedElement;
-          let selectorText = aRule._domRule.selectorText;
-          let matches = false;
+        let unmatched = aRule._matchId !== this._matchId ||
+                        this._ruleHasUnmatchedSelector(aRule);
+        if (!unmatched) {
+          return false;
+        }
 
-          do {
-            if (element.mozMatchesSelector(selectorText)) {
-              matches = true;
-              break;
-            }
-          } while ((element = element.parentNode) &&
-                   element.nodeType === Ci.nsIDOMNode.ELEMENT_NODE);
-
-          if (!matches) {
-            // Now we know that there are rules but none match.
+        aProperties = aProperties.filter(function(aProperty) {
+          if (!aRule.getPropertyValue(aProperty)) {
+            // Keep this property for the next rule. We need to find a rule
+            // which has the property.
             return true;
           }
-        }
+
+          result[aProperty] = true;
+
+          // We found a rule that has the current property while it does not
+          // match the current element. We can remove this property from the
+          // array.
+          return false;
+        });
+
+        return aProperties.length == 0;
       }, this);
     }, this);
+
+    aProperties.forEach(function(aProperty) { result[aProperty] = false; });
+
+    return result;
   },
+
+  /**
+   * Check if a CssRule has an unmatched selector for the highlighted element or
+   * its parents.
+   *
+   * @private
+   * @param {CssRule} aRule The rule you want to check if it has an unmatched
+   * selector.
+   * @return {boolean} True if the rule has an unmatched selector, false
+   * otherwise.
+   */
+  _ruleHasUnmatchedSelector: function CL__ruleHasUnmatchedSelector(aRule)
+  {
+    if (!aRule._cssSheet && aRule.sourceElement) {
+      // CssRule wraps element.style, which never has unmatched selectors.
+      return false;
+    }
+
+    let element = this.viewedElement;
+    let selectors = aRule.selectors;
+
+    do {
+      selectors = selectors.filter(function(aSelector) {
+        return !element.mozMatchesSelector(aSelector);
+      });
+
+      if (selectors.length == 0) {
+        break;
+      }
+    } while ((element = element.parentNode) &&
+             element.nodeType === Ci.nsIDOMNode.ELEMENT_NODE);
+
+    return selectors.length > 0;
+  },
+
+  /**
+   * Tells if the given DOM CSS object matches the current view media.
+   *
+   * @param {object} aDomObject The DOM CSS object to check.
+   * @return {boolean} True if the DOM CSS object matches the current view
+   * media, or false otherwise.
+   */
+  mediaMatches: function CL_mediaMatches(aDomObject)
+  {
+    let mediaText = aDomObject.media.mediaText;
+    return !mediaText || this.viewedDocument.defaultView.
+                         matchMedia(mediaText).matches;
+   },
 };
 
 /**
@@ -789,37 +888,6 @@ CssLogic.isSystemStyleSheet = function CssLogic_isSystemStyleSheet(aSheet)
   return false;
 };
 
-/**
- * Check if the given DOM CSS object holds an allowed media. Currently we only
- * allow media screen or all.
- *
- * @param {CSSStyleSheet|CSSImportRule|CSSMediaRule} aDomObject the
- * DOM object you want checked.
- * @return {boolean} true if the media description is allowed, or false
- * otherwise.
- */
-CssLogic.sheetMediaAllowed = function CssLogic_sheetMediaAllowed(aDomObject)
-{
-  let result = false;
-  let media = aDomObject.media;
-
-  if (media.length > 0) {
-    let mediaItem = null;
-    for (let m = 0, mediaLen = media.length; m < mediaLen; m++) {
-      mediaItem = media.item(m).toLowerCase();
-      if (mediaItem === CssLogic.MEDIA.SCREEN ||
-          mediaItem === CssLogic.MEDIA.ALL) {
-        result = true;
-        break;
-      }
-    }
-  } else {
-    result = true;
-  }
-
-  return result;
-};
-
 /**
  * Return a shortened version of a style sheet's source.
  *
@@ -827,27 +895,33 @@ CssLogic.sheetMediaAllowed = function CssLogic_sheetMediaAllowed(aDomObject)
  */
 CssLogic.shortSource = function CssLogic_shortSource(aSheet)
 {
-    // Use a string like "inline" if there is no source href
-    if (!aSheet || !aSheet.href) {
-      return CssLogic.l10n("rule.sourceInline");
-    }
+  // Use a string like "inline" if there is no source href
+  if (!aSheet || !aSheet.href) {
+    return CssLogic.l10n("rule.sourceInline");
+  }
 
-    // We try, in turn, the filename, filePath, query string, whole thing
-    let url = Services.io.newURI(aSheet.href, null, null);
+  // We try, in turn, the filename, filePath, query string, whole thing
+  let url = {};
+  try {
+    url = Services.io.newURI(aSheet.href, null, null);
     url = url.QueryInterface(Ci.nsIURL);
-    if (url.fileName) {
-      return url.fileName;
-    }
+  } catch (ex) {
+    // Some UA-provided stylesheets are not valid URLs.
+  }
 
-    if (url.filePath) {
-      return url.filePath;
-    }
+  if (url.fileName) {
+    return url.fileName;
+  }
 
-    if (url.query) {
-      return url.query;
-    }
+  if (url.filePath) {
+    return url.filePath;
+  }
 
-    return this.domSheet.href;
+  if (url.query) {
+    return url.query;
+  }
+
+  return aSheet.href;
 }
 
 /**
@@ -857,15 +931,13 @@ CssLogic.shortSource = function CssLogic_shortSource(aSheet)
  * @param {CssLogic} aCssLogic pointer to the CssLogic instance working with
  * this CssSheet object.
  * @param {CSSStyleSheet} aDomSheet reference to a DOM CSSStyleSheet object.
- * @param {boolean} aSystemSheet tells if the stylesheet is system-provided.
  * @param {number} aIndex tells the index/position of the stylesheet within the
  * main document.
  */
-function CssSheet(aCssLogic, aDomSheet, aSystemSheet, aIndex)
+function CssSheet(aCssLogic, aDomSheet, aIndex)
 {
   this._cssLogic = aCssLogic;
   this.domSheet = aDomSheet;
-  this.systemSheet = aSystemSheet;
   this.index = this.systemSheet ? -100 * aIndex : aIndex;
 
   // Cache of the sheets href. Cached by the getter.
@@ -884,6 +956,44 @@ function CssSheet(aCssLogic, aDomSheet, aSystemSheet, aIndex)
 
 CssSheet.prototype = {
   _passId: null,
+  _systemSheet: null,
+  _mediaMatches: null,
+
+  /**
+   * Tells if the stylesheet is provided by the browser or not.
+   *
+   * @return {boolean} true if this is a browser-provided stylesheet, or false
+   * otherwise.
+   */
+  get systemSheet()
+  {
+    if (this._systemSheet === null) {
+      this._systemSheet = CssLogic.isSystemStyleSheet(this.domSheet);
+    }
+    return this._systemSheet;
+  },
+
+  /**
+   * Tells if the stylesheet is disabled or not.
+   * @return {boolean} true if this stylesheet is disabled, or false otherwise.
+   */
+  get disabled()
+  {
+    return this.domSheet.disabled;
+  },
+
+  /**
+   * Tells if the stylesheet matches the current browser view media.
+   * @return {boolean} true if this stylesheet matches the current browser view
+   * media, or false otherwise.
+   */
+  get mediaMatches()
+  {
+    if (this._mediaMatches === null) {
+      this._mediaMatches = this._cssLogic.mediaMatches(this.domSheet);
+    }
+    return this._mediaMatches;
+  },
 
   /**
    * Get a source for a stylesheet, taking into account embedded stylesheets
@@ -976,7 +1086,7 @@ CssSheet.prototype = {
     if (cacheId in this._rules) {
       for (let i = 0, rulesLen = this._rules[cacheId].length; i < rulesLen; i++) {
         rule = this._rules[cacheId][i];
-        if (rule._domRule == aDomRule) {
+        if (rule._domRule === aDomRule) {
           ruleFound = true;
           break;
         }
@@ -1018,7 +1128,7 @@ CssSheet.prototype = {
         aCallback.call(aScope, this.getRule(aDomRule));
         ruleCount++;
       } else if (aDomRule.type == Ci.nsIDOMCSSRule.MEDIA_RULE &&
-          aDomRule.cssRules && CssLogic.sheetMediaAllowed(aDomRule)) {
+          aDomRule.cssRules && this._cssLogic.mediaMatches(aDomRule)) {
         Array.prototype.forEach.call(aDomRule.cssRules, _iterator, this);
       }
     }
@@ -1051,7 +1161,7 @@ CssSheet.prototype = {
       if (aDomRule.type == Ci.nsIDOMCSSRule.STYLE_RULE) {
         return aCallback.call(aScope, this.getRule(aDomRule));
       } else if (aDomRule.type == Ci.nsIDOMCSSRule.MEDIA_RULE &&
-          aDomRule.cssRules && CssLogic.sheetMediaAllowed(aDomRule)) {
+          aDomRule.cssRules && this._cssLogic.mediaMatches(aDomRule)) {
         return Array.prototype.some.call(aDomRule.cssRules, _iterator, this);
       }
     }
@@ -1409,8 +1519,6 @@ function CssPropertyInfo(aCssLogic, aProperty)
   // that have sheetAllowed = false).
   this._matchedSelectors = null;
   this._unmatchedSelectors = null;
-  this._hasMatchedSelectors = null;
-  this._hasUnmatchedSelectors = null;
 }
 
 CssPropertyInfo.prototype = {
@@ -1508,60 +1616,6 @@ CssPropertyInfo.prototype = {
     return this._unmatchedSelectors;
   },
 
-  /**
-   * Check if the property has any matched selectors.
-   * 
-   * @return {Boolean} true if the current element or it's parents have
-   * matching CssSelector objects, false otherwise
-   */
-  hasMatchedSelectors: function CssPropertyInfo_hasMatchedSelectors()
-  {
-    if (this._hasMatchedSelectors === null) {
-      this._hasMatchedSelectors = this._cssLogic.hasMatchedSelectors(function(aDomRules) {
-        if (!aDomRules.Count) {
-          // For element.style.
-          return !!aDomRules.style.getPropertyValue(this.property);
-        }
-
-        for (let i = 0; i < aDomRules.Count(); i++) {
-          let domRule = aDomRules.GetElementAt(i);
-
-          if (domRule.type !== Ci.nsIDOMCSSRule.STYLE_RULE) {
-            continue;
-          }
-
-          let domSheet = domRule.parentStyleSheet;
-          let systemSheet = CssLogic.isSystemStyleSheet(domSheet);
-          let filter = this._cssLogic.sourceFilter;
-          if (filter !== CssLogic.FILTER.UA && systemSheet) {
-            continue;
-          }
-
-          if (domRule.style.getPropertyValue(this.property)) {
-            return true;
-          }
-        }
-        return false;
-      }.bind(this));
-    }
-
-    return this._hasMatchedSelectors;
-  },
-
-  /**
-   * Check if the property has any matched selectors.
-   *
-   * @return {Boolean} true if the current element or it's parents have
-   * unmatched CssSelector objects, false otherwise
-   */
-  hasUnmatchedSelectors: function CssPropertyInfo_hasUnmatchedSelectors()
-  {
-    if (this._hasUnmatchedSelectors === null) {
-      this._hasUnmatchedSelectors = this._cssLogic.hasUnmatchedSelectors(this.property);
-    }
-    return this._hasUnmatchedSelectors;
-  },
-
   /**
    * Find the selectors that match the highlighted element and its parents.
    * Uses CssLogic.processMatchedSelectors() to find the matched selectors,
diff --git a/browser/devtools/styleinspector/CssRuleView.jsm b/browser/devtools/styleinspector/CssRuleView.jsm
index 151e1bf3788..3c6b86246e7 100644
--- a/browser/devtools/styleinspector/CssRuleView.jsm
+++ b/browser/devtools/styleinspector/CssRuleView.jsm
@@ -117,6 +117,17 @@ ElementStyle.prototype = {
 
   domUtils: Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils),
 
+  /**
+   * Called by the Rule object when it has been changed through the
+   * setProperty* methods.
+   */
+  _changed: function ElementStyle_changed()
+  {
+    if (this.onChanged) {
+      this.onChanged();
+    }
+  },
+
   /**
    * Refresh the list of rules to be displayed for the active element.
    * Upon completion, this.rules[] will hold a list of Rule objects.
@@ -125,19 +136,29 @@ ElementStyle.prototype = {
   {
     this.rules = [];
 
+    let element = this.element;
+    do {
+      this._addElementRules(element);
+    } while ((element = element.parentNode) &&
+             element.nodeType === Ci.nsIDOMNode.ELEMENT_NODE);
+
+    // Mark overridden computed styles.
+    this.markOverridden();
+  },
+
+  _addElementRules: function ElementStyle_addElementRules(aElement)
+  {
+    let inherited = aElement !== this.element ? aElement : null;
+
     // Include the element's style first.
-    this.rules.push(new Rule(this, {
-      style: this.element.style,
-      selectorText: CssLogic.l10n("rule.sourceElement")
-    }));
+    this._maybeAddRule({
+      style: aElement.style,
+      selectorText: CssLogic.l10n("rule.sourceElement"),
+      inherited: inherited
+    });
 
     // Get the styles that apply to the element.
-    try {
-      var domRules = this.domUtils.getCSSStyleRules(this.element);
-    } catch (ex) {
-      Services.console.logStringMessage("ElementStyle_populate error: " + ex);
-      return;
-    }
+    var domRules = this.domUtils.getCSSStyleRules(aElement);
 
     // getCSStyleRules returns ordered from least-specific to
     // most-specific.
@@ -150,14 +171,43 @@ ElementStyle.prototype = {
         continue;
       }
 
-      // XXX: non-style rules.
-      if (domRule.type === Ci.nsIDOMCSSRule.STYLE_RULE) {
-        this.rules.push(new Rule(this, { domRule: domRule }));
+      if (domRule.type !== Ci.nsIDOMCSSRule.STYLE_RULE) {
+        continue;
       }
+
+      this._maybeAddRule({
+        domRule: domRule,
+        inherited: inherited
+      });
+    }
+  },
+
+  /**
+   * Add a rule if it's one we care about.  Filters out duplicates and
+   * inherited styles with no inherited properties.
+   *
+   * @param {object} aOptions
+   *        Options for creating the Rule, see the Rule constructor.
+   *
+   * @return true if we added the rule.
+   */
+  _maybeAddRule: function ElementStyle_maybeAddRule(aOptions)
+  {
+    // If we've already included this domRule (for example, when a
+    // common selector is inherited), ignore it.
+    if (aOptions.domRule &&
+        this.rules.some(function(rule) rule.domRule === aOptions.domRule)) {
+      return false;
     }
 
-    // Mark overridden computed styles.
-    this.markOverridden();
+    let rule = new Rule(this, aOptions);
+
+    // Ignore inherited rules with no properties.
+    if (aOptions.inherited && rule.textProps.length == 0) {
+      return false;
+    }
+
+    this.rules.push(rule);
   },
 
   /**
@@ -178,7 +228,7 @@ ElementStyle.prototype = {
     let computedProps = [];
     for each (let textProp in textProps) {
       computedProps = computedProps.concat(textProp.computed);
-    };
+    }
 
     // Walk over the computed properties.  As we see a property name
     // for the first time, mark that property's name as taken by this
@@ -214,7 +264,7 @@ ElementStyle.prototype = {
 
       computedProp._overriddenDirty = (!!computedProp.overridden != overridden);
       computedProp.overridden = overridden;
-      if (!computedProp.overridden) {
+      if (!computedProp.overridden && computedProp.textProp.enabled) {
         taken[computedProp.name] = computedProp;
       }
     }
@@ -273,6 +323,8 @@ ElementStyle.prototype = {
  *            the domRule's style will be used.
  *          selectorText: selector text to display.  If omitted, the domRule's
  *            selectorText will be used.
+ *          inherited: An element this rule was inherited from.  If omitted,
+ *            the rule applies directly to the current element.
  * @constructor
  */
 function Rule(aElementStyle, aOptions)
@@ -281,7 +333,7 @@ function Rule(aElementStyle, aOptions)
   this.domRule = aOptions.domRule || null;
   this.style = aOptions.style || this.domRule.style;
   this.selectorText = aOptions.selectorText || this.domRule.selectorText;
-
+  this.inherited = aOptions.inherited || null;
   this._getTextProperties();
 }
 
@@ -297,6 +349,17 @@ Rule.prototype = {
       let line = this.elementStyle.domUtils.getRuleLine(this.domRule);
       this._title += ":" + line;
     }
+
+    if (this.inherited) {
+      let eltText = this.inherited.tagName.toLowerCase();
+      if (this.inherited.id) {
+        eltText += "#" + this.inherited.id;
+      }
+      let args = [eltText, this._title];
+      this._title = CssLogic._strings.formatStringFromName("rule.inheritedSource",
+                                                           args, args.length);
+    }
+
     return this._title;
   },
 
@@ -336,6 +399,7 @@ Rule.prototype = {
       prop.priority = this.style.getPropertyPriority(prop.name);
       prop.updateComputed();
     }
+    this.elementStyle._changed();
 
     this.elementStyle.markOverridden();
   },
@@ -416,7 +480,13 @@ Rule.prototype = {
       if(!matches || !matches[2])
         continue;
 
-      let prop = new TextProperty(this, matches[1], matches[2], matches[3] || "");
+      let name = matches[1];
+      if (this.inherited &&
+          !this.elementStyle.domUtils.isInheritedProperty(name)) {
+        continue;
+      }
+
+      let prop = new TextProperty(this, name, matches[2], matches[3] || "");
       this.textProps.push(prop);
     }
   },
@@ -478,6 +548,7 @@ TextProperty.prototype = {
     for (let i = 0, n = dummyStyle.length; i < n; i++) {
       let prop = dummyStyle.item(i);
       this.computed.push({
+        textProp: this,
         name: prop,
         value: dummyStyle.getPropertyValue(prop),
         priority: dummyStyle.getPropertyPriority(prop),
@@ -568,7 +639,15 @@ CssRuleView.prototype = {
       return;
     }
 
+    if (this._elementStyle) {
+      delete this._elementStyle.onChanged;
+    }
+
     this._elementStyle = new ElementStyle(aElement);
+    this._elementStyle.onChanged = function() {
+      this._changed();
+    }.bind(this);
+
     this._createEditors();
   },
 
@@ -584,6 +663,17 @@ CssRuleView.prototype = {
     this._elementStyle = null;
   },
 
+  /**
+   * Called when the user has made changes to the ElementStyle.
+   * Emits an event that clients can listen to.
+   */
+  _changed: function CssRuleView_changed()
+  {
+    var evt = this.doc.createEvent("Events");
+    evt.initEvent("CssRuleViewChanged", true, false);
+    this.element.dispatchEvent(evt);
+  },
+
   /**
    * Creates editor UI for each of the rules in _elementStyle.
    */
@@ -944,10 +1034,12 @@ TextPropertyEditor.prototype = {
    */
   _parseValue: function TextPropertyEditor_parseValue(aValue)
   {
-    let [value, priority] = aValue.split("!", 2);
+    let pieces = aValue.split("!", 2);
+    let value = pieces[0];
+    let priority = pieces.length > 1 ? pieces[1] : "";
     return {
-      value: value.trim(),
-      priority: (priority ? priority.trim() : "")
+      value: pieces[0].trim(),
+      priority: (pieces.length > 1 ? pieces[1].trim() : "")
     };
   },
 
diff --git a/browser/devtools/styleinspector/StyleInspector.jsm b/browser/devtools/styleinspector/StyleInspector.jsm
index bf8958d23db..2d59a6ec656 100644
--- a/browser/devtools/styleinspector/StyleInspector.jsm
+++ b/browser/devtools/styleinspector/StyleInspector.jsm
@@ -87,6 +87,7 @@ StyleInspector.prototype = {
         context: this,
         get isOpen() isOpen(),
         onSelect: this.selectNode,
+        onChanged: this.updateNode,
         show: this.open,
         hide: this.close,
         dim: this.dimTool,
@@ -112,7 +113,7 @@ StyleInspector.prototype = {
     let boundIframeOnLoad = function loadedInitializeIframe() {
       if (this.iframe &&
           this.iframe.getAttribute("src") ==
-          "chrome://browser/content/csshtmltree.xhtml") {
+          "chrome://browser/content/devtools/csshtmltree.xul") {
         let selectedNode = this.selectedNode || null;
         this.cssHtmlTree = new CssHtmlTree(this);
         this.cssLogic.highlight(selectedNode);
@@ -152,10 +153,6 @@ StyleInspector.prototype = {
     panel.setAttribute("width", 350);
     panel.setAttribute("height", this.window.screen.height / 2);
 
-    let vbox = this.document.createElement("vbox");
-    vbox.setAttribute("flex", "1");
-    panel.appendChild(vbox);
-
     let iframe = this.document.createElement("iframe");
     let boundIframeOnLoad = function loadedInitializeIframe()
     {
@@ -165,24 +162,12 @@ StyleInspector.prototype = {
         aCallback(this);
     }.bind(this);
 
-    iframe.setAttribute("flex", "1");
+    iframe.flex = 1;
     iframe.setAttribute("tooltip", "aHTMLTooltip");
     iframe.addEventListener("load", boundIframeOnLoad, true);
-    iframe.setAttribute("src", "chrome://browser/content/csshtmltree.xhtml");
+    iframe.setAttribute("src", "chrome://browser/content/devtools/csshtmltree.xul");
 
-    vbox.appendChild(iframe);
-
-    let hbox = this.document.createElement("hbox");
-    hbox.setAttribute("class", "resizerbox");
-    vbox.appendChild(hbox);
-
-    let spacer = this.document.createElement("spacer");
-    spacer.setAttribute("flex", "1");
-    hbox.appendChild(spacer);
-
-    let resizer = this.document.createElement("resizer");
-    resizer.setAttribute("dir", "bottomend");
-    hbox.appendChild(resizer);
+    panel.appendChild(iframe);
     popupSet.appendChild(panel);
 
     this._boundPopupShown = this.popupShown.bind(this);
@@ -263,6 +248,17 @@ StyleInspector.prototype = {
     }
   },
 
+  /**
+   * Update the display for the currently-selected node.
+   */
+  updateNode: function SI_updateNode()
+  {
+    if (this.isOpen() && !this.dimmed) {
+      this.cssLogic.highlight(this.selectedNode);
+      this.cssHtmlTree.refreshPanel();
+    }
+  },
+
   /**
    * Dim or undim a panel by setting or removing a dimmed attribute.
    * @param aState
@@ -282,7 +278,7 @@ StyleInspector.prototype = {
     this.selectNode(aSelection);
     if (this.openDocked) {
       if (!this.iframeReady) {
-        this.iframe.setAttribute("src", "chrome://browser/content/csshtmltree.xhtml");
+        this.iframe.setAttribute("src", "chrome://browser/content/devtools/csshtmltree.xul");
       }
     } else {
       this.panel.openPopup(this.window.gBrowser.selectedBrowser, "end_before", 0, 0,
diff --git a/browser/devtools/styleinspector/csshtmltree.xhtml b/browser/devtools/styleinspector/csshtmltree.xul
similarity index 56%
rename from browser/devtools/styleinspector/csshtmltree.xhtml
rename to browser/devtools/styleinspector/csshtmltree.xul
index 3984e6b2102..d4bd5cc7ada 100644
--- a/browser/devtools/styleinspector/csshtmltree.xhtml
+++ b/browser/devtools/styleinspector/csshtmltree.xul
@@ -1,20 +1,4 @@
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/styleinspector.dtd">
-  %inspectorDTD;
-  <!ELEMENT loop ANY>
-  <!ATTLIST li foreach CDATA #IMPLIED>
-  <!ATTLIST div foreach CDATA #IMPLIED>
-  <!ATTLIST loop foreach CDATA #IMPLIED>
-  <!ATTLIST a target CDATA #IMPLIED>
-  <!ATTLIST a __pathElement CDATA #IMPLIED>
-  <!ATTLIST div _id CDATA #IMPLIED>
-  <!ATTLIST div save CDATA #IMPLIED>
-  <!ATTLIST table save CDATA #IMPLIED>
-  <!ATTLIST loop if CDATA #IMPLIED>
-  <!ATTLIST tr if CDATA #IMPLIED>
-]>
+<?xml version="1.0"?>
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
@@ -35,9 +19,10 @@
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
-   -   Joe Walker (jwalker@mozilla.com) (original author)
+   -   Joe Walker <jwalker@mozilla.com> (original author)
    -   Mihai Șucan <mihai.sucan@gmail.com>
    -   Michael Ratcliffe <mratcliffe@mozilla.com>
+   -   Dão Gottwald <dao@mozilla.com>
    -
    - 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
@@ -52,28 +37,52 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
-<html xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<head>
-  <meta http-equiv="Content-Type"
-    content="application/xhtml+xml; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css"
-    href="chrome://browser/skin/devtools/csshtmltree.css" />
-</head>
-<body role="application">
+
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/csshtmltree.css" type="text/css"?>
+
+<!DOCTYPE window [
+  <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/styleinspector.dtd">
+  %inspectorDTD;
+  <!ELEMENT loop ANY>
+  <!ATTLIST li foreach CDATA #IMPLIED>
+  <!ATTLIST div foreach CDATA #IMPLIED>
+  <!ATTLIST loop foreach CDATA #IMPLIED>
+  <!ATTLIST a target CDATA #IMPLIED>
+  <!ATTLIST a __pathElement CDATA #IMPLIED>
+  <!ATTLIST div _id CDATA #IMPLIED>
+  <!ATTLIST div save CDATA #IMPLIED>
+  <!ATTLIST table save CDATA #IMPLIED>
+  <!ATTLIST loop if CDATA #IMPLIED>
+  <!ATTLIST tr if CDATA #IMPLIED>
+]>
+
+<xul:window xmlns="http://www.w3.org/1999/xhtml"
+            xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <!-- The output from #templateRoot (below) is inserted here. -->
-<div id="root">
-</div>
+<div id="root"></div>
 
 <!-- The output from #templatePath (below) is inserted here. -->
 <div id="path">
 </div>
 
+<!-- When no properties are found the following block is displayed. -->
+<div id="noResults" hidden="">
+  &noPropertiesFound;
+</div>
+
 <!-- The output from #templateProperty (below) is appended here. -->
 <div id="propertyContainer">
 </div>
 
+<xul:hbox id="footer">
+  <xul:label class="legendKey bestmatch">&bestMatch;</xul:label>
+  <xul:label class="legendKey matched">&matched;</xul:label>
+  <xul:label class="legendKey parentmatch">&parentMatch;</xul:label>
+  <xul:spacer flex="1"/>
+  <xul:resizer dir="bottomright"/>
+</xul:hbox>
 <!--
 To visually debug the templates without running firefox, alter the display:none
 -->
@@ -83,15 +92,16 @@ To visually debug the templates without running firefox, alter the display:none
   styles" checkbox. For data it needs an instance of CssHtmlTree.
   -->
   <div id="templateRoot">
-    <div class="filters">
-      <label class="userStylesLabel" dir="${getRTLAttr}">
+    <xul:hbox class="headerControls" flex="1">
+      <label class="userStylesLabel">
+        <input class="onlyuserstyles" save="${onlyUserStylesCheckbox}"
+               type="checkbox" onchange="${onlyUserStylesChanged}" checked=""/>
         &userStylesLabel;
-        <input class="userStyles" save="${onlyUserStylesCheckbox}" type="checkbox"
-               onchange="${onlyUserStylesChanged}" checked=""/>
       </label>
-      <input save="${searchField}" class="searchfield" type="text"
-             oninput="${filterChanged}"/>
-    </div>
+      <xul:textbox class="searchfield" type="search" save="${searchField}"
+                   placeholder="&userStylesSearch;"
+                   oncommand="${filterChanged}"/>
+    </xul:hbox>
   </div>
 
   <!--
@@ -99,16 +109,17 @@ To visually debug the templates without running firefox, alter the display:none
   at. For data it needs an instance of CssHtmlTree.
   -->
   <div id="templatePath">
-    <p class="path">
-      <label dir="${getRTLAttr}">&lookingAtLabel;</label>
-      <ol>
-        <li foreach="item in ${pathElements}" dir="${getRTLAttr}">
-          <a href="#" onclick="${pathClick}" __pathElement="${item.element}">
-            ${__element.pathElement = item.element; item.display}
-          </a>
-        </li>
-      </ol>
-    </p>
+    <span class="selectedElementLabel">
+      &selectedElementLabel;
+    </span>
+    <!-- following broken in RTL mode, see bug 699900 -->
+    <ol>
+      <li foreach="item in ${pathElements}">
+        <a href="#" onclick="${pathClick}" __pathElement="${item.element}">
+          ${__element.pathElement = item.element; item.display}
+        </a>
+      </li>
+    </ol>
   </div>
 
   <!--
@@ -118,29 +129,20 @@ To visually debug the templates without running firefox, alter the display:none
   }
   -->
   <div id="templateProperty">
-    <div class="${className}" save="${element}" dir="${getRTLAttr}">
-      <div class="property-header">
-        <div class="property-name" dir="${getRTLAttr}">
-          <a class="link" target="_blank" title="&helpLinkTitle;"
-              href="${link}">${name}</a>
+    <div class="${className}" save="${element}">
+      <xul:hbox class="property-header" save="${propertyHeader}"
+                onclick="${propertyHeaderClick}">
+        <div save="${matchedExpander}" class="match expander"/>
+        <div class="property-name">${name}</div>
+        <div class="helplink-container">
+          <a href="${link}" class="helplink" title="&helpLinkTitle;" onclick="${mdnLinkClick}">
+            &helpLinkTitle;
+          </a>
         </div>
         <div save="${valueNode}" class="property-value" dir="ltr">${value}</div>
-      </div>
+      </xul:hbox>
 
-      <div save="${matchedSelectorsContainer}" class="rulelink" dir="${getRTLAttr}">
-        <div onclick="${matchedSelectorsClick}" class="rule-matched">
-          <div save="${matchedExpander}" class="expander"></div>
-          <div save="${matchedSelectorsTitleNode}">&matchedSelectors;</div>
-        </div>
-        <table save="${matchedSelectorTable}" dir="${getRTLAttr}"></table>
-      </div>
-
-      <div save="${unmatchedSelectorsContainer}" class="rulelink" dir="${getRTLAttr}">
-        <div onclick="${unmatchedSelectorsClick}" class="rule-unmatched">
-          <div save="${unmatchedExpander}" class="expander"></div>
-          <div save="${unmatchedSelectorsTitleNode}">&unmatchedSelectors;</div>
-        </div>
-        <table save="${unmatchedSelectorTable}" dir="${getRTLAttr}"></table>
+      <div save="${matchedSelectorsContainer}" class="rulelink">
       </div>
     </div>
   </div>
@@ -163,32 +165,7 @@ To visually debug the templates without running firefox, alter the display:none
           </td>
           <td class="rule-link">
             <a target="_blank" href="view-source:${selector.selectorInfo.href}" class="link"
-                title="${selector.selectorInfo.href}">${selector.selectorInfo.source}</a>
-          </td>
-        </tr>
-      </loop>
-    </table>
-  </div>
-
-  <!--
-  A templateUnmatchedSelectors sits inside each templateProperties showing the
-  list of selectors that fail to affect that property. Each needs data like this:
-  {
-    unmatchedSelectorViews: ..., // from cssHtmlTree.propertyViews[name].unmatchedSelectorViews
-  }
-  This is a template so the parent does not need to be a table, except that
-  using a div as the parent causes the DOM to muck with the tr elements
-  -->
-  <div id="templateUnmatchedSelectors">
-    <table>
-      <loop foreach="selector in ${unmatchedSelectorViews}">
-        <tr>
-          <td dir="ltr" class="rule-text unmatched">
-            ${selector.humanReadableText(__element)}
-          </td>
-          <td class="rule-link">
-            <a target="_blank" href="view-source:${selector.selectorInfo.href}" class="link"
-                title="${selector.selectorInfo.href}">${selector.selectorInfo.source}</a>
+               title="${selector.selectorInfo.href}">${selector.selectorInfo.source}</a>
           </td>
         </tr>
       </loop>
@@ -196,5 +173,4 @@ To visually debug the templates without running firefox, alter the display:none
   </div>
 </div>
 
-</body>
-</html>
+</xul:window>
diff --git a/browser/devtools/styleinspector/cssruleview.xhtml b/browser/devtools/styleinspector/cssruleview.xul
similarity index 72%
rename from browser/devtools/styleinspector/cssruleview.xhtml
rename to browser/devtools/styleinspector/cssruleview.xul
index f06f0f18a64..dc69c56a6f9 100644
--- a/browser/devtools/styleinspector/cssruleview.xhtml
+++ b/browser/devtools/styleinspector/cssruleview.xul
@@ -1,9 +1,4 @@
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/styleinspector.dtd">
-  %inspectorDTD;
-]>
+<?xml version="1.0"?>
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Version: MPL 1.1/GPL 2.0/LGPL 2.1
    -
@@ -39,15 +34,11 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
-<html xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<head>
-  <meta http-equiv="Content-Type"
-    content="application/xhtml+xml; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css"
-    href="chrome://browser/content/devtools/styleinspector.css" />
-  <link rel="stylesheet" type="text/css"
-    href="chrome://browser/skin/devtools/csshtmltree.css" />
-</head>
-<body role="application" id="ruleview-body"></body>
-</html>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
+<?xml-stylesheet href="chrome://browser/content/devtools/styleinspector.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/csshtmltree.css" type="text/css"?>
+<!DOCTYPE window [
+  <!ENTITY % inspectorDTD SYSTEM "chrome://browser/locale/devtools/styleinspector.dtd">
+  %inspectorDTD;
+]>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
diff --git a/browser/devtools/styleinspector/test/browser/Makefile.in b/browser/devtools/styleinspector/test/browser/Makefile.in
index f53cc206d58..26728730c0a 100644
--- a/browser/devtools/styleinspector/test/browser/Makefile.in
+++ b/browser/devtools/styleinspector/test/browser/Makefile.in
@@ -51,8 +51,10 @@ _BROWSER_TEST_FILES = \
   browser_bug683672.js \
   browser_styleinspector_bug_672746_default_styles.js \
   browser_styleinspector_bug_672744_search_filter.js \
+  browser_styleinspector_bug_689759_no_results_placeholder.js \
   browser_bug_692400_element_style.js \
   browser_ruleview_editor.js \
+  browser_ruleview_inherit.js \
   browser_ruleview_manipulation.js \
   browser_ruleview_override.js \
   browser_ruleview_ui.js \
diff --git a/browser/devtools/styleinspector/test/browser/browser_bug683672.js b/browser/devtools/styleinspector/test/browser/browser_bug683672.js
index 583a1537a4e..e620e870b2b 100644
--- a/browser/devtools/styleinspector/test/browser/browser_bug683672.js
+++ b/browser/devtools/styleinspector/test/browser/browser_bug683672.js
@@ -38,7 +38,7 @@ function runTests()
   ok(stylePanel.isOpen(), "style inspector is open");
 
   testMatchedSelectors();
-  testUnmatchedSelectors();
+  //testUnmatchedSelectors();
 
   info("finishing up");
   Services.obs.addObserver(finishUp, "StyleInspector-closed", false);
@@ -65,7 +65,7 @@ function testMatchedSelectors()
   is(numMatchedSelectors, 6,
       "CssLogic returns the correct number of matched selectors for div");
 
-  is(propertyView.propertyInfo.hasMatchedSelectors(), true,
+  is(propertyView.hasMatchedSelectors, true,
       "hasMatchedSelectors returns true");
 }
 
@@ -89,7 +89,7 @@ function testUnmatchedSelectors()
   is(numUnmatchedSelectors, 13,
       "CssLogic returns the correct number of unmatched selectors for body");
 
-  is(propertyView.propertyInfo.hasUnmatchedSelectors(), true,
+  is(propertyView.hasUnmatchedSelectors, true,
       "hasUnmatchedSelectors returns true");
 }
 
diff --git a/browser/devtools/styleinspector/test/browser/browser_bug_692400_element_style.js b/browser/devtools/styleinspector/test/browser/browser_bug_692400_element_style.js
index 29fe10aaf6d..0506c60538e 100644
--- a/browser/devtools/styleinspector/test/browser/browser_bug_692400_element_style.js
+++ b/browser/devtools/styleinspector/test/browser/browser_bug_692400_element_style.js
@@ -44,7 +44,7 @@ function SI_checkText()
   propertyView.matchedExpanded = true;
   propertyView.refreshMatchedSelectors();
 
-  let td = propertyView.matchedSelectorTable.querySelector("td.rule-text");
+  let td = propertyView.matchedSelectorsContainer.querySelector("td.rule-text");
   ok(td, "found the first table row");
 
   let selector = propertyView.matchedSelectorViews[0];
diff --git a/browser/devtools/styleinspector/test/browser/browser_ruleview_inherit.js b/browser/devtools/styleinspector/test/browser/browser_ruleview_inherit.js
new file mode 100644
index 00000000000..cd76aae880b
--- /dev/null
+++ b/browser/devtools/styleinspector/test/browser/browser_ruleview_inherit.js
@@ -0,0 +1,101 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Cu.import("resource:///modules/devtools/CssRuleView.jsm");
+
+let doc;
+
+function simpleInherit()
+{
+  let style = '' +
+    '#test2 {' +
+    '  background-color: green;' +
+    '  color: purple;' +
+    '}';
+
+  let styleNode = addStyle(doc, style);
+  doc.body.innerHTML = '<div id="test2"><div id="test1">Styled Node</div></div>';
+
+  let elementStyle = new _ElementStyle(doc.getElementById("test1"));
+
+  is(elementStyle.rules.length, 2, "Should have 2 rules.");
+
+  let elementRule = elementStyle.rules[0];
+  ok(!elementRule.inherited, "Element style attribute should not consider itself inherited.");
+
+  let inheritRule = elementStyle.rules[1];
+  is(inheritRule.selectorText, "#test2", "Inherited rule should be the one that includes inheritable properties.");
+  ok(!!inheritRule.inherited, "Rule should consider itself inherited.");
+  is(inheritRule.textProps.length, 1, "Should only display one inherited style");
+  let inheritProp = inheritRule.textProps[0];
+  is(inheritProp.name, "color", "color should have been inherited.");
+
+  styleNode.parentNode.removeChild(styleNode);
+
+  emptyInherit();
+}
+
+function emptyInherit()
+{
+  // No inheritable styles, this rule shouldn't show up.
+  let style = '' +
+    '#test2 {' +
+    '  background-color: green;' +
+    '}';
+
+  let styleNode = addStyle(doc, style);
+  doc.body.innerHTML = '<div id="test2"><div id="test1">Styled Node</div></div>';
+
+  let elementStyle = new _ElementStyle(doc.getElementById("test1"));
+
+  is(elementStyle.rules.length, 1, "Should have 1 rule.");
+
+  let elementRule = elementStyle.rules[0];
+  ok(!elementRule.inherited, "Element style attribute should not consider itself inherited.");
+
+  styleNode.parentNode.removeChild(styleNode);
+
+  elementStyleInherit();
+}
+
+function elementStyleInherit()
+{
+  doc.body.innerHTML = '<div id="test2" style="color: red"><div id="test1">Styled Node</div></div>';
+
+  let elementStyle = new _ElementStyle(doc.getElementById("test1"));
+
+  is(elementStyle.rules.length, 2, "Should have 2 rules.");
+
+  let elementRule = elementStyle.rules[0];
+  ok(!elementRule.inherited, "Element style attribute should not consider itself inherited.");
+
+  let inheritRule = elementStyle.rules[1];
+  ok(!inheritRule.domRule, "Inherited rule should be an element style, not a rule.");
+  ok(!!inheritRule.inherited, "Rule should consider itself inherited.");
+  is(inheritRule.textProps.length, 1, "Should only display one inherited style");
+  let inheritProp = inheritRule.textProps[0];
+  is(inheritProp.name, "color", "color should have been inherited.");
+
+  finishTest();
+}
+
+function finishTest()
+{
+  doc = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, arguments.callee, true);
+    doc = content.document;
+    waitForFocus(simpleInherit, content);
+  }, true);
+
+  content.location = "data:text/html,basic style inspector tests";
+}
diff --git a/browser/devtools/styleinspector/test/browser/browser_ruleview_override.js b/browser/devtools/styleinspector/test/browser/browser_ruleview_override.js
index 763cfb11889..261156a5bb3 100644
--- a/browser/devtools/styleinspector/test/browser/browser_ruleview_override.js
+++ b/browser/devtools/styleinspector/test/browser/browser_ruleview_override.js
@@ -110,6 +110,33 @@ function importantOverride()
   ok(classProp.overridden, "New important prop should override class property.");
   ok(!elementProp.overridden, "New important prop should not be overriden.");
 
+  disableOverride();
+}
+
+function disableOverride()
+{
+  let style = '' +
+    '#testid {' +
+    '  background-color: blue;' +
+    '}' +
+    '.testclass {' +
+    '  background-color: green;' +
+    '}';
+  let styleNode = addStyle(doc, style);
+  doc.body.innerHTML = '<div id="testid" class="testclass">Styled Node</div>';
+
+  let elementStyle = new _ElementStyle(doc.getElementById("testid"));
+
+  let idRule = elementStyle.rules[1];
+  let idProp = idRule.textProps[0];
+  idProp.setEnabled(false);
+
+  let classRule = elementStyle.rules[2];
+  let classProp = classRule.textProps[0];
+  ok(!classProp.overridden, "Class prop should not be overridden after id prop was disabled.");
+
+  styleNode.parentNode.removeChild(styleNode);
+
   finishTest();
 }
 
diff --git a/browser/devtools/styleinspector/test/browser/browser_ruleview_ui.js b/browser/devtools/styleinspector/test/browser/browser_ruleview_ui.js
index ed26effe3c3..636d5dc5f89 100644
--- a/browser/devtools/styleinspector/test/browser/browser_ruleview_ui.js
+++ b/browser/devtools/styleinspector/test/browser/browser_ruleview_ui.js
@@ -32,6 +32,18 @@ function waitForEditorBlur(aEditor, aCallback)
   }, false);
 }
 
+var gRuleViewChanged = false;
+function ruleViewChanged()
+{
+  gRuleViewChanged = true;
+}
+
+function expectChange()
+{
+  ok(gRuleViewChanged, "Rule view should have fired a change event.");
+  gRuleViewChanged = false;
+}
+
 function startTest()
 {
   let style = '' +
@@ -46,15 +58,15 @@ function startTest()
   doc.body.innerHTML = '<div id="testid" class="testclass">Styled Node</div>';
   let testElement = doc.getElementById("testid");
 
-  ruleDialog = openDialog("chrome://browser/content/devtools/cssruleview.xhtml",
+  ruleDialog = openDialog("chrome://browser/content/devtools/cssruleview.xul",
                           "cssruleviewtest",
                           "width=200,height=350");
   ruleDialog.addEventListener("load", function onLoad(evt) {
     ruleDialog.removeEventListener("load", onLoad);
     let doc = ruleDialog.document;
-    let body = doc.getElementById("ruleview-body");
     ruleView = new CssRuleView(doc);
-    body.appendChild(ruleView.element);
+    doc.documentElement.appendChild(ruleView.element);
+    ruleView.element.addEventListener("CssRuleViewChanged", ruleViewChanged, false);
     ruleView.highlight(testElement);
     waitForFocus(testCancelNew, ruleDialog);
   }, true);
@@ -70,6 +82,7 @@ function testCancelNew()
     is(elementRuleEditor.newPropSpan.inplaceEditor, aEditor, "Next focused editor should be the new property editor.");
     let input = aEditor.input;
     waitForEditorBlur(aEditor, function () {
+      ok(!gRuleViewChanged, "Shouldn't get a change event after a cancel.");
       is(elementRuleEditor.rule.textProps.length,  0, "Should have canceled creating a new text property.");
       ok(!elementRuleEditor.propertyList.hasChildNodes(), "Should not have any properties.");
       testCreateNew();
@@ -92,6 +105,7 @@ function testCreateNew()
     input.value = "background-color";
 
     waitForEditorFocus(elementRuleEditor.element, function onNewValue(aEditor) {
+      expectChange();
       is(elementRuleEditor.rule.textProps.length,  1, "Should have created a new text property.");
       is(elementRuleEditor.propertyList.children.length, 1, "Should have created a property editor.");
       let textProp = elementRuleEditor.rule.textProps[0];
@@ -99,6 +113,7 @@ function testCreateNew()
 
       aEditor.input.value = "purple";
       waitForEditorBlur(aEditor, function() {
+        expectChange();
         is(textProp.value, "purple", "Text prop should have been changed.");
         testEditProperty();
       });
@@ -121,10 +136,12 @@ function testEditProperty()
     is(propEditor.nameSpan.inplaceEditor, aEditor, "Next focused editor should be the name editor.");
     let input = aEditor.input;
     waitForEditorFocus(propEditor.element, function onNewName(aEditor) {
+      expectChange();
       input = aEditor.input;
       is(propEditor.valueSpan.inplaceEditor, aEditor, "Focus should have moved to the value.");
 
       waitForEditorBlur(aEditor, function() {
+        expectChange();
         is(idRuleEditor.rule.style.getPropertyValue("border-color"), "red",
            "border-color should have been set.");
         testDisableProperty();
@@ -151,14 +168,20 @@ function testDisableProperty()
 
   propEditor.enable.click();
   is(idRuleEditor.rule.style.getPropertyValue("border-color"), "", "Border-color should have been unset.");
+  expectChange();
+
   propEditor.enable.click();
   is(idRuleEditor.rule.style.getPropertyValue("border-color"), "red",
      "Border-color should have been reset.");
+  expectChange();
+
   finishTest();
 }
 
 function finishTest()
 {
+  ruleView.element.removeEventListener("CssRuleViewChanged", ruleViewChanged, false);
+  ruleView.clear();
   ruleDialog.close();
   ruleDialog = ruleView = null;
   doc = null;
diff --git a/browser/devtools/styleinspector/test/browser/browser_styleinspector.js b/browser/devtools/styleinspector/test/browser/browser_styleinspector.js
index 0f53bf23568..ef263573df6 100644
--- a/browser/devtools/styleinspector/test/browser/browser_styleinspector.js
+++ b/browser/devtools/styleinspector/test/browser/browser_styleinspector.js
@@ -64,7 +64,7 @@ function SI_CheckProperty()
   let cssLogic = stylePanel.cssLogic;
   let propertyInfo = cssLogic.getPropertyInfo("color");
   ok(propertyInfo.matchedRuleCount > 0, "color property has matching rules");
-  ok(propertyInfo.unmatchedRuleCount > 0, "color property has unmatched rules");
+  //ok(propertyInfo.unmatchedRuleCount > 0, "color property has unmatched rules");
 }
 
 function finishUp()
diff --git a/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672744_search_filter.js b/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672744_search_filter.js
index a4956d42621..d67a0ac2587 100644
--- a/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672744_search_filter.js
+++ b/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672744_search_filter.js
@@ -52,8 +52,9 @@ function SI_toggleDefaultStyles()
   Services.obs.removeObserver(SI_toggleDefaultStyles, "StyleInspector-populated", false);
 
   info("clearing \"only user styles\" checkbox");
+
   let iframe = stylePanel.iframe;
-  let checkbox = iframe.contentDocument.querySelector(".userStyles");
+  let checkbox = iframe.contentDocument.querySelector(".onlyuserstyles");
   Services.obs.addObserver(SI_AddFilterText, "StyleInspector-populated", false);
   EventUtils.synthesizeMouse(checkbox, 5, 5, {}, iframe.contentWindow);
 }
@@ -64,7 +65,6 @@ function SI_AddFilterText()
 
   let iframe = stylePanel.iframe;
   let searchbar = iframe.contentDocument.querySelector(".searchfield");
-
   Services.obs.addObserver(SI_checkFilter, "StyleInspector-populated", false);
   info("setting filter text to \"color\"");
   searchbar.focus();
diff --git a/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672746_default_styles.js b/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672746_default_styles.js
index a7f29885f12..f7a5cfa3309 100644
--- a/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672746_default_styles.js
+++ b/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672746_default_styles.js
@@ -62,7 +62,7 @@ function SI_toggleDefaultStyles()
 {
   // Click on the checkbox.
   let iframe = stylePanel.iframe;
-  let checkbox = iframe.contentDocument.querySelector(".userStyles");
+  let checkbox = iframe.contentDocument.querySelector(".onlyuserstyles");
   Services.obs.addObserver(SI_checkDefaultStyles, "StyleInspector-populated", false);
   EventUtils.synthesizeMouse(checkbox, 5, 5, {}, iframe.contentWindow);
 }
@@ -86,7 +86,7 @@ function propertyVisible(aName)
   let propertyViews = stylePanel.cssHtmlTree.propertyViews;
   for each (let propView in propertyViews) {
     if (propView.name == aName) {
-      return propView.className == "property-view";
+      return propView.visible;
     }
   }
 }
diff --git a/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_689759_no_results_placeholder.js b/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_689759_no_results_placeholder.js
new file mode 100644
index 00000000000..0a7ae442d51
--- /dev/null
+++ b/browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_689759_no_results_placeholder.js
@@ -0,0 +1,118 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that the no results placeholder works properly.
+
+let doc;
+let stylePanel;
+
+function createDocument()
+{
+  doc.body.innerHTML = '<style type="text/css"> ' +
+    '.matches {color: #F00;}</style>' +
+    '<span id="matches" class="matches">Some styled text</span>';
+  doc.title = "Tests that the no results placeholder works properly";
+  ok(window.StyleInspector, "StyleInspector exists");
+  stylePanel = new StyleInspector(window);
+  Services.obs.addObserver(runStyleInspectorTests, "StyleInspector-opened", false);
+  stylePanel.createPanel(false, function() {
+    stylePanel.open(doc.body);
+  });
+}
+
+function runStyleInspectorTests()
+{
+  Services.obs.removeObserver(runStyleInspectorTests, "StyleInspector-opened", false);
+
+  ok(stylePanel.isOpen(), "style inspector is open");
+
+  Services.obs.addObserver(SI_AddFilterText, "StyleInspector-populated", false);
+
+  let span = doc.querySelector("#matches");
+  ok(span, "captain, we have the matches span");
+
+  let htmlTree = stylePanel.cssHtmlTree;
+  stylePanel.selectNode(span);
+
+  is(span, htmlTree.viewedElement,
+    "style inspector node matches the selected node");
+  is(htmlTree.viewedElement, stylePanel.cssLogic.viewedElement,
+     "cssLogic node matches the cssHtmlTree node");
+}
+
+function SI_AddFilterText()
+{
+  Services.obs.removeObserver(SI_AddFilterText, "StyleInspector-populated", false);
+
+  let iframe = stylePanel.iframe;
+  let searchbar = stylePanel.cssHtmlTree.searchField;
+  let searchTerm = "xxxxx";
+
+  Services.obs.addObserver(SI_checkPlaceholderVisible, "StyleInspector-populated", false);
+  info("setting filter text to \"" + searchTerm + "\"");
+  searchbar.focus();
+  for each (let c in searchTerm) {
+    EventUtils.synthesizeKey(c, {}, iframe.contentWindow);
+  }
+}
+
+function SI_checkPlaceholderVisible()
+{
+  Services.obs.removeObserver(SI_checkPlaceholderVisible, "StyleInspector-populated", false);
+  info("SI_checkPlaceholderVisible called");
+  let placeholder = stylePanel.cssHtmlTree.noResults;
+  let iframe = stylePanel.iframe;
+  let display = iframe.contentWindow.getComputedStyle(placeholder).display;
+
+  is(display, "block", "placeholder is visible");
+
+  SI_ClearFilterText();
+}
+
+function SI_ClearFilterText()
+{
+  let iframe = stylePanel.iframe;
+  let searchbar = stylePanel.cssHtmlTree.searchField;
+
+  Services.obs.addObserver(SI_checkPlaceholderHidden, "StyleInspector-populated", false);
+  info("clearing filter text");
+  searchbar.focus();
+  searchbar.value = "";
+  EventUtils.synthesizeKey("c", {}, iframe.contentWindow);
+}
+
+function SI_checkPlaceholderHidden()
+{
+  Services.obs.removeObserver(SI_checkPlaceholderHidden, "StyleInspector-populated", false);
+  let placeholder = stylePanel.cssHtmlTree.noResults;
+  let iframe = stylePanel.iframe;
+  let display = iframe.contentWindow.getComputedStyle(placeholder).display;
+
+  is(display, "none", "placeholder is hidden");
+
+  Services.obs.addObserver(finishUp, "StyleInspector-closed", false);
+  stylePanel.close();
+}
+
+function finishUp()
+{
+  Services.obs.removeObserver(finishUp, "StyleInspector-closed", false);
+  ok(!stylePanel.isOpen(), "style inspector is closed");
+  doc = stylePanel = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
+
+function test()
+{
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    doc = content.document;
+    waitForFocus(createDocument, content);
+  }, true);
+
+  content.location = "data:text/html,no results placeholder test";
+}
diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
index b2bd0eb232f..317f73f1728 100644
--- a/browser/devtools/webconsole/HUDService.jsm
+++ b/browser/devtools/webconsole/HUDService.jsm
@@ -198,7 +198,9 @@ const LEVELS = {
   dir: SEVERITY_LOG,
   group: SEVERITY_LOG,
   groupCollapsed: SEVERITY_LOG,
-  groupEnd: SEVERITY_LOG
+  groupEnd: SEVERITY_LOG,
+  time: SEVERITY_LOG,
+  timeEnd: SEVERITY_LOG
 };
 
 // The lowest HTTP response code (inclusive) that is considered an error.
@@ -2094,6 +2096,30 @@ HUD_SERVICE.prototype =
         }
         return;
 
+      case "time":
+        if (!args) {
+          return;
+        }
+        if (args.error) {
+          Cu.reportError(this.getStr(args.error));
+          return;
+        }
+        body = this.getFormatStr("timerStarted", [args.name]);
+        clipboardText = body;
+        sourceURL = aMessage.filename;
+        sourceLine = aMessage.lineNumber;
+        break;
+
+      case "timeEnd":
+        if (!args) {
+          return;
+        }
+        body = this.getFormatStr("timeEnd", [args.name, args.duration]);
+        clipboardText = body;
+        sourceURL = aMessage.filename;
+        sourceLine = aMessage.lineNumber;
+        break;
+
       default:
         Cu.reportError("Unknown Console API log level: " + level);
         return;
@@ -4622,7 +4648,7 @@ function JSTermHelper(aJSTerm)
     });
 
     let iframe = createAndAppendElement(panel, "iframe", {
-      src: "chrome://browser/content/devtools/cssruleview.xhtml",
+      src: "chrome://browser/content/devtools/cssruleview.xul",
       flex: "1",
     });
 
@@ -4630,8 +4656,7 @@ function JSTermHelper(aJSTerm)
       panel.removeEventListener("load", onLoad, true);
       let doc = iframe.contentDocument;
       let view = new CssRuleView(doc);
-      let body = doc.getElementById("ruleview-body");
-      body.appendChild(view.element);
+      doc.documentElement.appendChild(view.element);
       view.highlight(aNode);
     }, true);
 
diff --git a/browser/devtools/webconsole/test/browser/Makefile.in b/browser/devtools/webconsole/test/browser/Makefile.in
index 7bb12573c5b..06f43b751db 100644
--- a/browser/devtools/webconsole/test/browser/Makefile.in
+++ b/browser/devtools/webconsole/test/browser/Makefile.in
@@ -149,6 +149,7 @@ _BROWSER_TEST_FILES = \
 	browser_gcli_integrate.js \
 	browser_gcli_require.js \
 	browser_gcli_web.js \
+	browser_webconsole_bug_658368_time_methods.js \
 	head.js \
 	$(NULL)
 
@@ -220,6 +221,7 @@ _BROWSER_TEST_PAGES = \
 	test-bug-678816-content.js \
 	test-file-location.js \
 	browser_gcli_inspect.html \
+	test-bug-658368-time-methods.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/devtools/webconsole/test/browser/browser_webconsole_bug_658368_time_methods.js b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_658368_time_methods.js
new file mode 100644
index 00000000000..32b85dfa488
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_658368_time_methods.js
@@ -0,0 +1,87 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Tests that the Console API implements the time() and timeEnd() methods.
+
+function test() {
+  addTab("http://example.com/browser/browser/devtools/webconsole/" +
+         "test/browser/test-bug-658368-time-methods.html");
+  openConsole();
+  browser.addEventListener("load", onLoad, true);
+}
+
+function onLoad(aEvent) {
+  browser.removeEventListener(aEvent.type, onLoad, true);
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let hud = HUDService.hudReferences[hudId];
+  outputNode = hud.outputNode;
+
+  executeSoon(function() {
+    findLogEntry("aTimer: timer started");
+    findLogEntry("ms");
+
+    // The next test makes sure that timers with the same name but in separate
+    // tabs, do not contain the same value.
+    addTab("data:text/html,<script type='text/javascript'>" +
+           "console.timeEnd('bTimer');</script>");
+    openConsole();
+    browser.addEventListener("load", testTimerIndependenceInTabs, true);
+  });
+}
+
+function testTimerIndependenceInTabs(aEvent) {
+  browser.removeEventListener(aEvent.type, testTimerIndependenceInTabs, true);
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let hud = HUDService.hudReferences[hudId];
+  outputNode = hud.outputNode;
+
+  executeSoon(function() {
+    testLogEntry(outputNode, "bTimer: timer started", "bTimer was not started",
+                 false, true);
+
+    // The next test makes sure that timers with the same name but in separate
+    // pages, do not contain the same value.
+    browser.addEventListener("load", testTimerIndependenceInSameTab, true);
+    content.location = "data:text/html,<script type='text/javascript'>" +
+           "console.time('bTimer');</script>";
+  });
+}
+
+function testTimerIndependenceInSameTab(aEvent) {
+  browser.removeEventListener(aEvent.type, testTimerIndependenceInSameTab, true);
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let hud = HUDService.hudReferences[hudId];
+  outputNode = hud.outputNode;
+
+  executeSoon(function() {
+    findLogEntry("bTimer: timer started");
+    hud.jsterm.clearOutput();
+
+    // Now the following console.timeEnd() call shouldn't display anything,
+    // if the timers in different pages are not related.
+    browser.addEventListener("load", testTimerIndependenceInSameTabAgain, true);
+    content.location = "data:text/html,<script type='text/javascript'>" +
+           "console.timeEnd('bTimer');</script>";
+  });
+}
+
+function testTimerIndependenceInSameTabAgain(aEvent) {
+  browser.removeEventListener(aEvent.type, testTimerIndependenceInSameTabAgain, true);
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let hud = HUDService.hudReferences[hudId];
+  outputNode = hud.outputNode;
+
+  executeSoon(function() {
+    testLogEntry(outputNode, "bTimer: timer started", "bTimer was not started",
+                 false, true);
+
+    finishTest();
+  });
+}
diff --git a/browser/devtools/webconsole/test/browser/test-bug-658368-time-methods.html b/browser/devtools/webconsole/test/browser/test-bug-658368-time-methods.html
new file mode 100644
index 00000000000..f1754d600bc
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser/test-bug-658368-time-methods.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<!-- Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ -->
+  <head>
+    <title>Test for bug 658368: Expand console object with time and timeEnd
+      methods</title>
+  </head>
+  <body>
+    <h1>Test for bug 658368: Expand console object with time and timeEnd
+      methods</h1>
+
+    <script type="text/javascript">
+      function foo() {
+        console.timeEnd("aTimer");
+      }
+      console.time("aTimer");
+      foo();
+      console.time("bTimer");
+    </script>
+  </body>
+</html>
+
diff --git a/browser/devtools/webconsole/test/browser/test-console-extras.html b/browser/devtools/webconsole/test/browser/test-console-extras.html
index ff23b644211..ab40b108920 100644
--- a/browser/devtools/webconsole/test/browser/test-console-extras.html
+++ b/browser/devtools/webconsole/test/browser/test-console-extras.html
@@ -4,8 +4,6 @@
     <script type="text/javascript">
       function test() {
         console.log("start");
-        console.time();
-        console.timeEnd()
         console.exception()
         console.assert()
         console.clear()
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index a79a45c22d4..60bfd61fc88 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -278,8 +278,6 @@
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/nsSearchService.js
 @BINPATH@/components/nsSearchSuggestions.js
-@BINPATH@/components/nsTryToClose.manifest
-@BINPATH@/components/nsTryToClose.js
 @BINPATH@/components/passwordmgr.manifest
 @BINPATH@/components/nsLoginInfo.js
 @BINPATH@/components/nsLoginManager.js
@@ -481,9 +479,7 @@
 ; svg
 @BINPATH@/res/svg.css
 @BINPATH@/components/dom_svg.xpt
-#ifdef MOZ_SMIL
 @BINPATH@/components/dom_smil.xpt
-#endif
 
 ; [Personal Security Manager]
 ;
diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.properties b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
index 6f5bb87a9c8..f265cda6f39 100644
--- a/browser/locales/en-US/chrome/browser/devtools/inspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/inspector.properties
@@ -23,3 +23,8 @@ htmlPanel.tooltiptext=HTML panel
 # toolbar button.
 htmlPanel.accesskey=H
 
+# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
+# associated with the Highlighter's CSS Rule View in the Style Sidebar.
+ruleView.label=Rules
+ruleView.accesskey=R
+ruleView.tooltiptext=View and Edit CSS
\ No newline at end of file
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
index 625492d7614..56427f2b788 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd
@@ -3,10 +3,14 @@
   -  should be displayed or not. -->
 <!ENTITY userStylesLabel    "Only user styles">
 
-<!-- LOCALIZATION NOTE (lookingAtLabel): This is the label for the path of
+<!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
+  -  the search box when no search term has been entered. -->
+<!ENTITY userStylesSearch      "Search">
+
+<!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
   -  tree. -->
-<!ENTITY lookingAtLabel        "Looking at:">
+<!ENTITY selectedElementLabel  "Selected element:">
 
 <!-- LOCALIZATION NOTE (helpLinkTitle): For each style property
   -  the user can hover it and get a help link button which allows one to
@@ -14,12 +18,22 @@
   -  This is the link title shown in the hover tooltip. -->
 <!ENTITY helpLinkTitle         "Read the documentation for this property">
 
-<!-- LOCALIZATION NOTE (matchedSelectors): For each style property the
-  -  panel shows whether there are any selectors that match the currently
-  -  selected element. -->
-<!ENTITY matchedSelectors      "Matched selectors">
+<!-- LOCALIZATION NOTE (noPropertiesFound): In the case where there are no CSS
+  -  properties to display e.g. due to search criteria this message is
+  -  displayed. -->
+<!ENTITY noPropertiesFound     "No CSS properties found.">
 
 <!-- LOCALIZATION NOTE (unmatchedSelectors): For each style property
   -  the panel shows whether there are any selectors that do not match the
   -  currently selected element. -->
 <!ENTITY unmatchedSelectors    "Unmatched selectors">
+
+<!-- LOCALIZATION NOTE (bestMatch, matched, parentMatch & unmatched): For each
+  -  style property the panel shows the rules which hold that specific property.
+  -  For every rule, the rule status is also displayed: a rule can be the best
+  -  match, a match, a parent match, or a rule did not match the element the
+  -  user has highlighted. -->
+<!ENTITY bestMatch             "Best Match">
+<!ENTITY matched               "Matched">
+<!ENTITY parentMatch           "Parent Match">
+<!ENTITY unmatched             "Unmatched">
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
index f04eb2b15fd..13ec8c81fa0 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
@@ -19,6 +19,12 @@ rule.status.UNMATCHED=Unmatched
 rule.sourceInline=inline
 rule.sourceElement=element
 
+# LOCALIZATION NOTE (rule.inheritedSource): Shown for CSS rules
+# that were inherited from a parent node.  Will be passed a node
+# identifier and a source location.
+# e.g "Inherited from body#bodyID (styles.css:20)"
+rule.inheritedSource=Inherited from %S (%S)
+
 # LOCALIZATION NOTE (group): Style properties are displayed in categories and
 # these are the category names.
 group.Text_Fonts_and_Color=Text, Fonts & Color
@@ -34,3 +40,4 @@ group.Effects_and_Other=Effects and Other
 style.highlighter.button.label1=Properties
 style.highlighter.accesskey1=P
 style.highlighter.button.tooltip=Inspect element styles
+
diff --git a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
index b78faef1b8c..42efd108705 100644
--- a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/webconsole.properties
@@ -172,3 +172,15 @@ stacktrace.anonymousFunction=<anonymous>
 # to console.trace(). The stack trace of JavaScript function calls is displayed.
 # In this minimal message we only show the last call.
 stacktrace.outputMessage=Stack trace from %S, function %S, line %S.
+
+# LOCALIZATION NOTE (timerStarted):
+# This string is used to display the result of the console.time() call.
+# %S=name of timer
+timerStarted=%S: timer started
+
+# LOCALIZATION NOTE (timeEnd):
+# This string is used to display the result of the console.timeEnd() call.
+# %1$S=name of timer, %2$S=number of milliseconds
+timeEnd=%1$S: %2$Sms
+
+maxTimersExceeded=The maximum allowed number of timers in this page was exceeded.
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 65ff556485d..edc0b725d6e 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -1904,6 +1904,16 @@ panel[dimmed="true"] {
 
 #status-bar {
   min-height: 0;
+  -moz-appearance: none;
+  background-color: transparent;
+  border: none;
+}
+
+#addon-bar[customizing] > #status-bar {
+  opacity: .5;
+  background-image: -moz-repeating-linear-gradient(-45deg,
+                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);
 }
 
 #status-bar > statusbarpanel {
diff --git a/browser/themes/gnomestripe/browser/devtools/arrows.png b/browser/themes/gnomestripe/browser/devtools/arrows.png
index 95e72179278..447d7393839 100644
Binary files a/browser/themes/gnomestripe/browser/devtools/arrows.png and b/browser/themes/gnomestripe/browser/devtools/arrows.png differ
diff --git a/browser/themes/gnomestripe/browser/devtools/csshtmltree.css b/browser/themes/gnomestripe/browser/devtools/csshtmltree.css
index 98b32c0ffba..1d643f02f04 100644
--- a/browser/themes/gnomestripe/browser/devtools/csshtmltree.css
+++ b/browser/themes/gnomestripe/browser/devtools/csshtmltree.css
@@ -22,6 +22,7 @@
  *   Joe Walker <jwalker@mozilla.com> (original author)
  *   Mihai Șucan <mihai.sucan@gmail.com>
  *   Michael Ratcliffe <mratcliffe@mozilla.com>
+ *   Dão Gottwald <dao@mozilla.com>
  *
  * 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
@@ -37,114 +38,135 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-body {
-  font-family: sans-serif;
-  font-size: 11px;
-  background: #EEE;
+:root {
+  -moz-appearance: none;
+  background: -moz-Field;
+  color: -moz-FieldText;
 }
-.path,
-.filters {
+
+#root {
+  display: -moz-box;
+}
+
+#path {
   font-size: 11px;
   word-spacing: -1px;
+  margin-bottom: 0;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+  padding: 4px 5px 0;
 }
-.path ol {
+#path ol {
   list-style: none outside none;
   margin: 0;
   padding: 0;
 }
-.path li {
+#path li {
   border-radius: 3px;
   padding: 2px 3px;
-  text-shadow: #FFF 0 1px 0;
-  font-weight: bold;
   font-size: 11px;
-  background: -moz-linear-gradient(top, #F6F6FF, #E3E3FF);
   display: inline-block;
 }
-.path li:after {
+#path li:after {
   content: " > ";
 }
-.path li:last-child {
-  background: -moz-linear-gradient(top, #FFC, #DD8);
+#path li:last-child {
+  font-weight: bold;
+  color: #0091ff;
 }
-.path li:last-child:after {
-  color: red;
+#path li:last-child:after {
   content: "";
 }
 
 .property-header {
-  padding: 2px 5px;
-  background: -moz-linear-gradient(top, #F8F8F8, #E8E8E8);
-  color: #666;
+  padding: 4px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 5px;
 }
 
-.property-name,
-.rule-matched,
 .rule-unmatched {
   cursor: pointer;
+  padding: 2px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 0;
+  white-space: nowrap;
 }
 
 /* Take away these two :visited rules to get a core dumper     */
 /* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */
-.link {
-  color: #55A;
-}
+.link,
 .link:visited {
-  color: #55A;
+  color: #0091ff;
 }
-a.link {
-  text-decoration: none;
-  cursor: pointer;
-}
-a.link:visited {
+.link,
+.helplink,
+.link:visited,
+.helplink:visited {
   text-decoration: none;
 }
 
-.rule-matched,
-.rule-unmatched {
-  padding: 2px 0;
-  white-space: nowrap;
+.helplink-container {
+  position: relative;
+  top: 2px;
+}
+
+.helplink {
+  display: block;
+  height: 14px;
+  width: 0;
+  overflow: hidden;
+  -moz-padding-start: 14px;
+  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
+  -moz-margin-end: 2px;
+}
+
+.property-header:not(:hover) > .helplink-container {
+  visibility: hidden;
+}
+
+.unmatchedSelectorTable {
+  -moz-margin-start: 15px;
 }
 
 .rulelink {
-  color: #55A;
+  color: -moz-dialogtext;
+  -moz-margin-start: 12px;
 }
 
 .expander {
-  width: 8px;
-  height: 8px;
-  float: left;
-  -moz-margin-start: 15px;
+  -moz-appearance: treetwisty;
+  -moz-margin-start: 10px;
   -moz-margin-end: 5px;
-  margin-top: 3px;
-  background: url("chrome://browser/skin/devtools/arrows.png");
-  background-position: 24px 0;
 }
 
-.searchfield {
-  background: url("chrome://browser/skin/devtools/search.png") no-repeat #FFF;
-  border-radius: 5px;
-  -moz-padding-start: 20px;
-  width: 135px;
-  float: right;
-}
-
-.expander[dir="rtl"] {
-  background-position: 16px 0;
-}
 .expander[open] {
-  background-position: 8px 0;
+  -moz-appearance: treetwistyopen;
+}
+
+.expandable {
+  cursor: pointer;
+}
+
+.match {
+  visibility: hidden;
+}
+
+.expandable > .match {
+  visibility: visible;
+}
+
+.only-unmatched {
+  -moz-margin-start: 0;
 }
 
 .property-name {
-  display: inline-block;
   font-size: 12px;
-  font-weight: bold;
-  color: #000;
+  color: -moz-FieldText;
+  width: 220px;
 }
 .property-value {
-  display: inline-block;
   font-size: 10px;
+  color: grey;
 }
 
 .property-view-hidden {
@@ -159,11 +181,7 @@ a.link:visited {
 /* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */
 .rule-text {
   direction: ltr;
-  -moz-padding-start: 10px;
-}
-
-.resizerbox {
-  background-color: window;
+  -moz-padding-start: 15px;
 }
 
 .bestmatch {
@@ -179,16 +197,68 @@ a.link:visited {
   color: brown;
 }
 
-.userStyles {
-  position: relative;
-  top: 3px;
+#propertyContainer {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-flex: 1;
+  overflow-y: auto;
 }
 
-.userStyles,
+.selectedElementLabel {
+  font-weight: bold;
+}
+
+.darkrow {
+  background-color: rgba(0,0,0,.022);
+}
+
+#noResults {
+  font-size: 18px;
+  margin-top: 5px;
+  text-align: center;
+}
+
+.headerControls {
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+  padding-top: 5px;
+}
+
+.onlyuserstyles,
 .userStylesLabel {
   cursor: pointer;
 }
 
+.userStylesLabel {
+  display: -moz-box;
+  white-space: nowrap;
+}
+
+.onlyuserstyles {
+  position: relative;
+  top: 3px;
+  font-family: sans-serif;
+  font-size: 11px;
+}
+
+.searchfield {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  margin-left: 10px;
+}
+
+.styleinspector-legend {
+  -moz-margin-start: 12px;
+}
+
+#footer {
+  border-top: 1px solid -moz-dialog;
+}
+
+.legendKey {
+  margin: 0 5px;
+}
+
 /**
  * CSS Rule View
  */
@@ -229,7 +299,7 @@ a.link:visited {
   -moz-margin-end: 5px;
 }
 
-.ruleview-expander[dir="rtl"] {
+.ruleview-expander:-moz-locale-dir(rtl) {
   background-position: 16px 0;
 }
 
diff --git a/browser/themes/gnomestripe/browser/devtools/goto-mdn.png b/browser/themes/gnomestripe/browser/devtools/goto-mdn.png
new file mode 100644
index 00000000000..dbe064863d6
Binary files /dev/null and b/browser/themes/gnomestripe/browser/devtools/goto-mdn.png differ
diff --git a/browser/themes/gnomestripe/browser/devtools/search.png b/browser/themes/gnomestripe/browser/devtools/search.png
deleted file mode 100644
index df7212d78c8..00000000000
Binary files a/browser/themes/gnomestripe/browser/devtools/search.png and /dev/null differ
diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn
index 377c6bc9f64..d37625c3d17 100644
--- a/browser/themes/gnomestripe/browser/jar.mn
+++ b/browser/themes/gnomestripe/browser/jar.mn
@@ -79,12 +79,12 @@ browser.jar:
   skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
   skin/classic/browser/tabview/edit-light.png         (tabview/edit-light.png)
-  skin/classic/browser/tabview/search.png             (tabview/search.png)  
+  skin/classic/browser/tabview/search.png             (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png     (tabview/stack-expander.png)
   skin/classic/browser/tabview/tabview.png            (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css            (tabview/tabview.css)
   skin/classic/browser/devtools/arrows.png            (devtools/arrows.png)
-  skin/classic/browser/devtools/search.png            (devtools/search.png)
+  skin/classic/browser/devtools/goto-mdn.png          (devtools/goto-mdn.png)
   skin/classic/browser/devtools/csshtmltree.css       (devtools/csshtmltree.css)
   skin/classic/browser/devtools/gcli.css              (devtools/gcli.css)
   skin/classic/browser/devtools/breadcrumbs/ltr-end-pressed.png              (devtools/breadcrumbs/ltr-end-pressed.png)
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index bdb98e1e525..f0d20a85d82 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -2469,6 +2469,13 @@ panel[dimmed="true"] {
   padding-right: 0;
 }
 
+#addon-bar[customizing] > #status-bar {
+  opacity: .5;
+  background-image: -moz-repeating-linear-gradient(-45deg,
+                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);
+}
+
 #status-bar > statusbarpanel {
   border-width: 0;
   -moz-appearance: none;
diff --git a/browser/themes/pinstripe/browser/devtools/arrows.png b/browser/themes/pinstripe/browser/devtools/arrows.png
index 95e72179278..447d7393839 100644
Binary files a/browser/themes/pinstripe/browser/devtools/arrows.png and b/browser/themes/pinstripe/browser/devtools/arrows.png differ
diff --git a/browser/themes/pinstripe/browser/devtools/csshtmltree.css b/browser/themes/pinstripe/browser/devtools/csshtmltree.css
index 98b32c0ffba..e62f2a96b47 100644
--- a/browser/themes/pinstripe/browser/devtools/csshtmltree.css
+++ b/browser/themes/pinstripe/browser/devtools/csshtmltree.css
@@ -22,6 +22,7 @@
  *   Joe Walker <jwalker@mozilla.com> (original author)
  *   Mihai Șucan <mihai.sucan@gmail.com>
  *   Michael Ratcliffe <mratcliffe@mozilla.com>
+ *   Dão Gottwald <dao@mozilla.com>
  *
  * 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
@@ -37,114 +38,137 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-body {
-  font-family: sans-serif;
-  font-size: 11px;
-  background: #EEE;
+:root {
+  -moz-appearance: none;
+  background: -moz-Field;
+  color: -moz-FieldText;
 }
-.path,
-.filters {
+
+#root {
+  display: -moz-box;
+}
+
+#path {
   font-size: 11px;
   word-spacing: -1px;
+  margin-bottom: 0;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+  padding: 4px 5px 0;
 }
-.path ol {
+#path ol {
   list-style: none outside none;
   margin: 0;
   padding: 0;
 }
-.path li {
+#path li {
   border-radius: 3px;
   padding: 2px 3px;
-  text-shadow: #FFF 0 1px 0;
-  font-weight: bold;
   font-size: 11px;
-  background: -moz-linear-gradient(top, #F6F6FF, #E3E3FF);
   display: inline-block;
 }
-.path li:after {
+#path li:after {
   content: " > ";
 }
-.path li:last-child {
-  background: -moz-linear-gradient(top, #FFC, #DD8);
+#path li:last-child {
+  font-weight: bold;
+  color: #0091ff;
 }
-.path li:last-child:after {
-  color: red;
+#path li:last-child:after {
   content: "";
 }
 
 .property-header {
-  padding: 2px 5px;
-  background: -moz-linear-gradient(top, #F8F8F8, #E8E8E8);
-  color: #666;
+  padding: 4px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 5px;
 }
 
-.property-name,
-.rule-matched,
 .rule-unmatched {
   cursor: pointer;
+  padding: 2px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 0;
+  white-space: nowrap;
 }
 
 /* Take away these two :visited rules to get a core dumper     */
 /* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */
-.link {
-  color: #55A;
-}
+.link,
 .link:visited {
-  color: #55A;
+  color: #0091ff;
 }
-a.link {
-  text-decoration: none;
-  cursor: pointer;
-}
-a.link:visited {
+.link,
+.helplink,
+.link:visited,
+.helplink:visited {
   text-decoration: none;
 }
 
-.rule-matched,
-.rule-unmatched {
-  padding: 2px 0;
-  white-space: nowrap;
+.helplink-container {
+  position: relative;
+  top: 2px;
+}
+
+.helplink {
+  display: block;
+  height: 14px;
+  width: 0;
+  overflow: hidden;
+  -moz-padding-start: 14px;
+  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
+  -moz-margin-end: 2px;
+}
+
+.property-header:not(:hover) > .helplink-container {
+  visibility: hidden;
+}
+
+.unmatchedSelectorTable {
+  -moz-margin-start: 15px;
 }
 
 .rulelink {
-  color: #55A;
+  color: -moz-dialogtext;
+  -moz-margin-start: 12px;
 }
 
 .expander {
-  width: 8px;
-  height: 8px;
-  float: left;
-  -moz-margin-start: 15px;
+  -moz-appearance: treetwisty;
+  width: 12px;
+  height: 12px;
+  -moz-margin-start: 5px;
   -moz-margin-end: 5px;
-  margin-top: 3px;
-  background: url("chrome://browser/skin/devtools/arrows.png");
-  background-position: 24px 0;
 }
 
-.searchfield {
-  background: url("chrome://browser/skin/devtools/search.png") no-repeat #FFF;
-  border-radius: 5px;
-  -moz-padding-start: 20px;
-  width: 135px;
-  float: right;
-}
-
-.expander[dir="rtl"] {
-  background-position: 16px 0;
-}
 .expander[open] {
-  background-position: 8px 0;
+  -moz-appearance: treetwistyopen;
+}
+
+.expandable {
+  cursor: pointer;
+}
+
+.match {
+  visibility: hidden;
+}
+
+.expandable > .match {
+  visibility: visible;
+}
+
+.only-unmatched {
+  -moz-margin-start: 0;
 }
 
 .property-name {
-  display: inline-block;
   font-size: 12px;
-  font-weight: bold;
-  color: #000;
+  color: -moz-FieldText;
+  width: 220px;
 }
 .property-value {
-  display: inline-block;
   font-size: 10px;
+  color: grey;
 }
 
 .property-view-hidden {
@@ -159,11 +183,7 @@ a.link:visited {
 /* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */
 .rule-text {
   direction: ltr;
-  -moz-padding-start: 10px;
-}
-
-.resizerbox {
-  background-color: window;
+  -moz-padding-start: 15px;
 }
 
 .bestmatch {
@@ -179,16 +199,68 @@ a.link:visited {
   color: brown;
 }
 
-.userStyles {
-  position: relative;
-  top: 3px;
+#propertyContainer {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-flex: 1;
+  overflow-y: auto;
 }
 
-.userStyles,
+.selectedElementLabel {
+  font-weight: bold;
+}
+
+.darkrow {
+  background-color: rgba(0,0,0,.022);
+}
+
+#noResults {
+  font-size: 18px;
+  margin-top: 5px;
+  text-align: center;
+}
+
+.headerControls {
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+  padding-top: 5px;
+}
+
+.onlyuserstyles,
 .userStylesLabel {
   cursor: pointer;
 }
 
+.userStylesLabel {
+  display: -moz-box;
+  white-space: nowrap;
+}
+
+.onlyuserstyles {
+  position: relative;
+  top: 3px;
+  font-family: sans-serif;
+  font-size: 11px;
+}
+
+.searchfield {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  margin-left: 10px;
+}
+
+.styleinspector-legend {
+  -moz-margin-start: 12px;
+}
+
+#footer {
+  border-top: 1px solid -moz-dialog;
+}
+
+.legendKey {
+  margin: 0 5px;
+}
+
 /**
  * CSS Rule View
  */
@@ -229,7 +301,7 @@ a.link:visited {
   -moz-margin-end: 5px;
 }
 
-.ruleview-expander[dir="rtl"] {
+.ruleview-expander:-moz-locale-dir(rtl) {
   background-position: 16px 0;
 }
 
diff --git a/browser/themes/pinstripe/browser/devtools/goto-mdn.png b/browser/themes/pinstripe/browser/devtools/goto-mdn.png
new file mode 100644
index 00000000000..dbe064863d6
Binary files /dev/null and b/browser/themes/pinstripe/browser/devtools/goto-mdn.png differ
diff --git a/browser/themes/pinstripe/browser/devtools/search.png b/browser/themes/pinstripe/browser/devtools/search.png
deleted file mode 100644
index df7212d78c8..00000000000
Binary files a/browser/themes/pinstripe/browser/devtools/search.png and /dev/null differ
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index cd33566ffca..0264b5c2a50 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -123,7 +123,7 @@ browser.jar:
   skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
   skin/classic/browser/devtools/arrows.png                  (devtools/arrows.png)
-  skin/classic/browser/devtools/search.png                  (devtools/search.png)
+  skin/classic/browser/devtools/goto-mdn.png                (devtools/goto-mdn.png)
   skin/classic/browser/devtools/csshtmltree.css             (devtools/csshtmltree.css)
   skin/classic/browser/devtools/gcli.css                    (devtools/gcli.css)
   skin/classic/browser/devtools/toolbarbutton-close.png     (devtools/toolbarbutton-close.png)
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 9092fed5a0c..8679968da42 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -2568,6 +2568,13 @@ panel[dimmed="true"] {
   min-height: 0;
 }
 
+#addon-bar[customizing] > #status-bar {
+  opacity: .5;
+  background-image: -moz-repeating-linear-gradient(-45deg,
+                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);
+}
+
 #status-bar > statusbarpanel {
   border-width: 0;
   -moz-appearance: none;
diff --git a/browser/themes/winstripe/browser/devtools/arrows.png b/browser/themes/winstripe/browser/devtools/arrows.png
index 95e72179278..447d7393839 100644
Binary files a/browser/themes/winstripe/browser/devtools/arrows.png and b/browser/themes/winstripe/browser/devtools/arrows.png differ
diff --git a/browser/themes/winstripe/browser/devtools/csshtmltree.css b/browser/themes/winstripe/browser/devtools/csshtmltree.css
index 98b32c0ffba..c5f5d3798d8 100644
--- a/browser/themes/winstripe/browser/devtools/csshtmltree.css
+++ b/browser/themes/winstripe/browser/devtools/csshtmltree.css
@@ -22,6 +22,7 @@
  *   Joe Walker <jwalker@mozilla.com> (original author)
  *   Mihai Șucan <mihai.sucan@gmail.com>
  *   Michael Ratcliffe <mratcliffe@mozilla.com>
+ *   Dão Gottwald <dao@mozilla.com>
  *
  * 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
@@ -37,114 +38,137 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-body {
-  font-family: sans-serif;
-  font-size: 11px;
-  background: #EEE;
+:root {
+  -moz-appearance: none;
+  background: -moz-Field;
+  color: -moz-FieldText;
 }
-.path,
-.filters {
+
+#root {
+  display: -moz-box;
+}
+
+#path {
   font-size: 11px;
   word-spacing: -1px;
+  margin-bottom: 0;
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+  padding: 4px 5px 0;
 }
-.path ol {
+#path ol {
   list-style: none outside none;
   margin: 0;
   padding: 0;
 }
-.path li {
+#path li {
   border-radius: 3px;
   padding: 2px 3px;
-  text-shadow: #FFF 0 1px 0;
-  font-weight: bold;
   font-size: 11px;
-  background: -moz-linear-gradient(top, #F6F6FF, #E3E3FF);
   display: inline-block;
 }
-.path li:after {
+#path li:after {
   content: " > ";
 }
-.path li:last-child {
-  background: -moz-linear-gradient(top, #FFC, #DD8);
+#path li:last-child {
+  font-weight: bold;
+  color: #0091ff;
 }
-.path li:last-child:after {
-  color: red;
+#path li:last-child:after {
   content: "";
 }
 
 .property-header {
-  padding: 2px 5px;
-  background: -moz-linear-gradient(top, #F8F8F8, #E8E8E8);
-  color: #666;
+  padding: 4px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 5px;
 }
 
-.property-name,
-.rule-matched,
 .rule-unmatched {
   cursor: pointer;
+  padding: 2px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 0;
+  white-space: nowrap;
 }
 
 /* Take away these two :visited rules to get a core dumper     */
 /* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */
-.link {
-  color: #55A;
-}
+.link,
 .link:visited {
-  color: #55A;
+  color: #0091ff;
 }
-a.link {
-  text-decoration: none;
-  cursor: pointer;
-}
-a.link:visited {
+.link,
+.helplink,
+.link:visited,
+.helplink:visited {
   text-decoration: none;
 }
 
-.rule-matched,
-.rule-unmatched {
-  padding: 2px 0;
-  white-space: nowrap;
+.helplink-container {
+  position: relative;
+  top: 2px;
+}
+
+.helplink {
+  display: block;
+  height: 14px;
+  width: 0;
+  overflow: hidden;
+  -moz-padding-start: 14px;
+  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
+  -moz-margin-end: 2px;
+}
+
+.property-header:not(:hover) > .helplink-container {
+  visibility: hidden;
+}
+
+.unmatchedSelectorTable {
+  -moz-margin-start: 15px;
 }
 
 .rulelink {
-  color: #55A;
+  color: -moz-dialogtext;
+  -moz-margin-start: 12px;
 }
 
 .expander {
-  width: 8px;
-  height: 8px;
-  float: left;
-  -moz-margin-start: 15px;
+  width: 9px;
+  height: 9px;
+  -moz-margin-start: 5px;
   -moz-margin-end: 5px;
-  margin-top: 3px;
-  background: url("chrome://browser/skin/devtools/arrows.png");
-  background-position: 24px 0;
+  background: url("chrome://global/skin/tree/twisty-clsd.png") center center no-repeat;
 }
 
-.searchfield {
-  background: url("chrome://browser/skin/devtools/search.png") no-repeat #FFF;
-  border-radius: 5px;
-  -moz-padding-start: 20px;
-  width: 135px;
-  float: right;
-}
-
-.expander[dir="rtl"] {
-  background-position: 16px 0;
-}
 .expander[open] {
-  background-position: 8px 0;
+  background-image: url("chrome://global/skin/tree/twisty-open.png");
+}
+
+.expandable {
+  cursor: pointer;
+}
+
+.match {
+  visibility: hidden;
+}
+
+.expandable > .match {
+  visibility: visible;
+}
+
+.only-unmatched {
+  -moz-margin-start: 0;
 }
 
 .property-name {
-  display: inline-block;
   font-size: 12px;
-  font-weight: bold;
-  color: #000;
+  color: -moz-FieldText;
+  width: 220px;
 }
 .property-value {
-  display: inline-block;
   font-size: 10px;
+  color: grey;
 }
 
 .property-view-hidden {
@@ -159,11 +183,7 @@ a.link:visited {
 /* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */
 .rule-text {
   direction: ltr;
-  -moz-padding-start: 10px;
-}
-
-.resizerbox {
-  background-color: window;
+  -moz-padding-start: 15px;
 }
 
 .bestmatch {
@@ -179,16 +199,68 @@ a.link:visited {
   color: brown;
 }
 
-.userStyles {
-  position: relative;
-  top: 3px;
+#propertyContainer {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-flex: 1;
+  overflow-y: auto;
 }
 
-.userStyles,
+.selectedElementLabel {
+  font-weight: bold;
+}
+
+.darkrow {
+  background-color: rgba(0,0,0,.022);
+}
+
+#noResults {
+  font-size: 18px;
+  margin-top: 5px;
+  text-align: center;
+}
+
+.headerControls {
+  color: -moz-dialogtext;
+  background-color: -moz-dialog;
+  padding-top: 5px;
+}
+
+.onlyuserstyles,
 .userStylesLabel {
   cursor: pointer;
 }
 
+.userStylesLabel {
+  display: -moz-box;
+  white-space: nowrap;
+}
+
+.onlyuserstyles {
+  position: relative;
+  top: 3px;
+  font-family: sans-serif;
+  font-size: 11px;
+}
+
+.searchfield {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  margin-left: 10px;
+}
+
+.styleinspector-legend {
+  -moz-margin-start: 12px;
+}
+
+#footer {
+  border-top: 1px solid -moz-dialog;
+}
+
+.legendKey {
+  margin: 0 5px;
+}
+
 /**
  * CSS Rule View
  */
@@ -229,7 +301,7 @@ a.link:visited {
   -moz-margin-end: 5px;
 }
 
-.ruleview-expander[dir="rtl"] {
+.ruleview-expander:-moz-locale-dir(rtl) {
   background-position: 16px 0;
 }
 
diff --git a/browser/themes/winstripe/browser/devtools/goto-mdn.png b/browser/themes/winstripe/browser/devtools/goto-mdn.png
new file mode 100644
index 00000000000..dbe064863d6
Binary files /dev/null and b/browser/themes/winstripe/browser/devtools/goto-mdn.png differ
diff --git a/browser/themes/winstripe/browser/devtools/search.png b/browser/themes/winstripe/browser/devtools/search.png
deleted file mode 100644
index df7212d78c8..00000000000
Binary files a/browser/themes/winstripe/browser/devtools/search.png and /dev/null differ
diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn
index 8aa38f8eb0d..d3358ea5fbc 100644
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -107,7 +107,7 @@ browser.jar:
         skin/classic/browser/tabview/tabview-inverted.png           (tabview/tabview-inverted.png)
         skin/classic/browser/tabview/tabview.css                    (tabview/tabview.css)
         skin/classic/browser/devtools/arrows.png                    (devtools/arrows.png)
-        skin/classic/browser/devtools/search.png                    (devtools/search.png)
+        skin/classic/browser/devtools/goto-mdn.png                  (devtools/goto-mdn.png)
         skin/classic/browser/devtools/csshtmltree.css               (devtools/csshtmltree.css)
         skin/classic/browser/devtools/gcli.css                      (devtools/gcli.css)
         skin/classic/browser/devtools/toolbarbutton-close.png       (devtools/toolbarbutton-close.png)
@@ -259,7 +259,7 @@ browser.jar:
         skin/classic/aero/browser/tabview/tabview-inverted.png       (tabview/tabview-inverted.png)
         skin/classic/aero/browser/tabview/tabview.css                (tabview/tabview.css)
         skin/classic/aero/browser/devtools/arrows.png                (devtools/arrows.png)
-        skin/classic/aero/browser/devtools/search.png                (devtools/search.png)
+        skin/classic/aero/browser/devtools/goto-mdn.png              (devtools/goto-mdn.png)
         skin/classic/aero/browser/devtools/csshtmltree.css           (devtools/csshtmltree.css)
         skin/classic/aero/browser/devtools/gcli.css                  (devtools/gcli.css)
         skin/classic/aero/browser/devtools/toolbarbutton-close.png   (devtools/toolbarbutton-close.png)
diff --git a/build/pymake/pymake/process.py b/build/pymake/pymake/process.py
index 2f2114dac0f..0fdd68bdbca 100644
--- a/build/pymake/pymake/process.py
+++ b/build/pymake/pymake/process.py
@@ -215,9 +215,13 @@ class PythonJob(Job):
             print >>sys.stderr, e
             return e.exitcode
         except:
-            print >>sys.stderr, sys.exc_info()[1]
-            print >>sys.stderr, traceback.print_exc()
-            return -127
+            e = sys.exc_info()[1]
+            if isinstance(e, SystemExit) and (e.code == 0 or e.code == '0'):
+                pass # sys.exit(0) is not a failure
+            else:
+                print >>sys.stderr, e
+                print >>sys.stderr, traceback.print_exc()
+                return -127
         finally:
             os.environ = oldenv
         return 0
diff --git a/build/pymake/tests/native-command-sys-exit.mk b/build/pymake/tests/native-command-sys-exit.mk
new file mode 100644
index 00000000000..085027c293a
--- /dev/null
+++ b/build/pymake/tests/native-command-sys-exit.mk
@@ -0,0 +1,8 @@
+#T gmake skip
+
+CMD = %pycmd asplode
+PYCOMMANDPATH = $(TESTPATH) $(TESTPATH)/subdir
+
+all:
+	$(CMD) 0
+	@echo TEST-PASS
diff --git a/build/pymake/tests/pycmd.py b/build/pymake/tests/pycmd.py
index 0bd57133e21..33af55d6d3e 100644
--- a/build/pymake/tests/pycmd.py
+++ b/build/pymake/tests/pycmd.py
@@ -1,4 +1,4 @@
-import os
+import os, sys
 
 def writetofile(args):
   with open(args[0], 'w') as f:
@@ -7,3 +7,7 @@ def writetofile(args):
 def writeenvtofile(args):
   with open(args[0], 'w') as f:
     f.write(os.environ[args[1]])
+
+def asplode(args):
+  sys.exit(args[0])
+  return 0
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 400ec3fd005..cf15f7892df 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -253,7 +253,6 @@ MOZ_PERMISSIONS = @MOZ_PERMISSIONS@
 MOZ_XTF = @MOZ_XTF@
 MOZ_SVG_DLISTS = @MOZ_SVG_DLISTS@
 MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
-MOZ_SMIL = @MOZ_SMIL@
 
 MOZ_PREF_EXTENSIONS = @MOZ_PREF_EXTENSIONS@
 
diff --git a/config/rules.mk b/config/rules.mk
index 606b94ff1a2..d1b969becd4 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -805,11 +805,11 @@ ifneq (,$(SHARED_LIBRARY)$(PROGRAM))
 export::
 ifdef PROGRAM
 	$(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
-	  $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/$(MOZ_APP_NAME)
+	  $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/bin
 endif
 ifdef SHARED_LIBRARY
 	$(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
-	  $(SHARED_LIBRARY_NAME) $(DIST)/$(MOZ_APP_NAME)
+	  $(SHARED_LIBRARY_NAME) $(DIST)/bin
 endif
 endif # SHARED_LIBRARY || PROGRAM
 endif # WINNT_
@@ -1469,7 +1469,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	$(PYTHON_PATH) \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(topsrcdir)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
 
@@ -1482,7 +1482,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(topsrcdir)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/configure.in b/configure.in
index 8f842918cc1..fdcb2047db4 100644
--- a/configure.in
+++ b/configure.in
@@ -6190,18 +6190,6 @@ if test -n "$MOZ_SVG_DLISTS"; then
   AC_DEFINE(MOZ_SVG_DLISTS)
 fi
 
-dnl ========================================================
-dnl SMIL
-dnl ========================================================
-MOZ_SMIL=1
-MOZ_ARG_DISABLE_BOOL(smil,
-[  --disable-smil          Disable SMIL animation support],
-    MOZ_SMIL=,
-    MOZ_SMIL=1 )
-if test -n "$MOZ_SMIL"; then
-  AC_DEFINE(MOZ_SMIL)
-fi
-
 dnl ========================================================
 dnl Build Freetype in the tree
 dnl ========================================================
@@ -8294,7 +8282,6 @@ AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_PERMISSIONS)
 AC_SUBST(MOZ_XTF)
 AC_SUBST(MOZ_PREF_EXTENSIONS)
-AC_SUBST(MOZ_SMIL)
 AC_SUBST(MOZ_JS_LIBS)
 AC_SUBST(MOZ_PSM)
 AC_SUBST(MOZ_DEBUG)
diff --git a/content/base/crashtests/693212.xhtml b/content/base/crashtests/693212.xhtml
new file mode 100644
index 00000000000..6cc600d3b43
--- /dev/null
+++ b/content/base/crashtests/693212.xhtml
@@ -0,0 +1,16 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script type="text/javascript">
+  function boom() { 
+    select = document.createElementNS("http://www.w3.org/1999/xhtml", "select");
+    text = document.body.childNodes[0];
+    select.setAttribute("onDOMSubtreeModified", "text.parentNode.removeChild(text);");
+    select.appendChild(text);
+  }
+</script>
+</head>
+
+<body onload="boom()">
+
+</body>
+</html>
diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list
index 7be996bc54a..263de8206d7 100644
--- a/content/base/crashtests/crashtests.list
+++ b/content/base/crashtests/crashtests.list
@@ -96,4 +96,5 @@ load 667336-1.html
 load 679459.html
 load 679689-1.html
 load 682463.html
+load 693212.xhtml
 load 698974-1.html
diff --git a/content/base/public/nsIContent.h b/content/base/public/nsIContent.h
index 911c5394efb..dae882c92d6 100644
--- a/content/base/public/nsIContent.h
+++ b/content/base/public/nsIContent.h
@@ -57,10 +57,8 @@ class nsAttrName;
 class nsTextFragment;
 class nsIDocShell;
 class nsIFrame;
-#ifdef MOZ_SMIL
 class nsISMILAttr;
 class nsIDOMCSSStyleDeclaration;
-#endif // MOZ_SMIL
 
 namespace mozilla {
 namespace css {
@@ -891,7 +889,6 @@ public:
     mPrimaryFrame = aFrame;
   }
 
-#ifdef MOZ_SMIL
   /*
    * Returns a new nsISMILAttr that allows the caller to animate the given
    * attribute on this element.
@@ -924,7 +921,6 @@ public:
    */
   virtual nsresult SetSMILOverrideStyleRule(mozilla::css::StyleRule* aStyleRule,
                                             bool aNotify) = 0;
-#endif // MOZ_SMIL
 
   nsresult LookupNamespaceURI(const nsAString& aNamespacePrefix,
                               nsAString& aNamespaceURI) const;
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 32be2842c8f..70925c18b71 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -61,9 +61,7 @@
 #include "nsGkAtoms.h"
 #include "nsAutoPtr.h"
 #include "nsPIDOMWindow.h"
-#ifdef MOZ_SMIL
 #include "nsSMILAnimationController.h"
-#endif // MOZ_SMIL
 #include "nsIScriptGlobalObject.h"
 #include "nsIDocumentEncoder.h"
 #include "nsIAnimationFrameListener.h"
@@ -745,10 +743,10 @@ public:
   virtual Element* GetFullScreenElement() = 0;
 
   /**
-   * Requests that the document make aElement the full-screen element,
-   * and move into full-screen mode.
+   * Asynchronously requests that the document make aElement the full-screen
+   * element, and move into full-screen mode.
    */
-  virtual void RequestFullScreen(Element* aElement) = 0;
+  virtual void AsyncRequestFullScreen(Element* aElement) = 0;
 
   /**
    * Requests that the document, and all documents in its hierarchy exit
@@ -1326,7 +1324,6 @@ public:
   void EnumerateFreezableElements(FreezableElementEnumerator aEnumerator,
                                   void* aData);
 
-#ifdef MOZ_SMIL
   // Indicates whether mAnimationController has been (lazily) initialized.
   // If this returns true, we're promising that GetAnimationController()
   // will have a non-null return value.
@@ -1336,7 +1333,6 @@ public:
   // initialization, if this document supports animation and if
   // mAnimationController isn't yet initialized.
   virtual nsSMILAnimationController* GetAnimationController() = 0;
-#endif // MOZ_SMIL
 
   // Makes the images on this document capable of having their animation
   // active or suspended. An Image will animate as long as at least one of its
@@ -1649,10 +1645,8 @@ protected:
   // themselves when they go away.
   nsAutoPtr<nsTHashtable<nsPtrHashKey<nsIContent> > > mFreezableElements;
 
-#ifdef MOZ_SMIL
   // SMIL Animation Controller, lazily-initialized in GetAnimationController
   nsRefPtr<nsSMILAnimationController> mAnimationController;
-#endif // MOZ_SMIL
 
   // Table of element properties for this document.
   nsPropertyTable mPropertyTable;
diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index 354c787320a..80e157922f8 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -284,9 +284,7 @@ private:
 // 0 is global.
 #define DOM_USER_DATA         1
 #define DOM_USER_DATA_HANDLER 2
-#ifdef MOZ_SMIL
 #define SMIL_MAPPED_ATTR_ANIMVAL 3
-#endif // MOZ_SMIL
 
 // IID for the nsINode interface
 #define NS_INODE_IID \
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 0779fe589a4..f41896c918d 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -185,11 +185,9 @@
 #include "nsDOMNavigationTiming.h"
 #include "nsEventStateManager.h"
 
-#ifdef MOZ_SMIL
 #include "nsSMILAnimationController.h"
 #include "imgIContainer.h"
 #include "nsSVGUtils.h"
-#endif // MOZ_SMIL
 
 #include "nsRefreshDriver.h"
 
@@ -214,8 +212,13 @@ using namespace mozilla::dom;
 
 typedef nsTArray<Link*> LinkArray;
 
+// Reference to the document which requested DOM full-screen mode.
 nsWeakPtr nsDocument::sFullScreenDoc = nsnull;
 
+// Reference to the root document of the branch containing the document
+// which requested DOM full-screen mode.
+nsWeakPtr nsDocument::sFullScreenRootDoc = nsnull;
+
 #ifdef PR_LOGGING
 static PRLogModuleInfo* gDocumentLeakPRLog;
 static PRLogModuleInfo* gCspPRLog;
@@ -1586,11 +1589,9 @@ nsDocument::~nsDocument()
     mStyleSheetSetList->Disconnect();
   }
 
-#ifdef MOZ_SMIL
   if (mAnimationController) {
     mAnimationController->Disconnect();
   }
-#endif // MOZ_SMIL
 
   mParentDocument = nsnull;
 
@@ -1873,12 +1874,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)
     cb.NoteXPCOMChild(tmp->mAnimationFrameListeners[i]);
   }
 
-#ifdef MOZ_SMIL
   // Traverse animation components
   if (tmp->mAnimationController) {
     tmp->mAnimationController->Traverse(&cb);
   }
-#endif // MOZ_SMIL
 
   if (tmp->mSubDocuments && tmp->mSubDocuments->ops) {
     PL_DHashTableEnumerate(tmp->mSubDocuments, SubDocTraverser, &cb);
@@ -1950,11 +1949,9 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
 
   tmp->mIdentifierMap.Clear();
 
-#ifdef MOZ_SMIL
   if (tmp->mAnimationController) {
     tmp->mAnimationController->Unlink();
   }
-#endif // MOZ_SMIL
   
   tmp->mInUnlinkOrDeletion = false;
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@@ -3763,13 +3760,11 @@ nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
                  "Script global object must be an inner window!");
   }
 #endif
-#ifdef MOZ_SMIL
   NS_ABORT_IF_FALSE(aScriptGlobalObject || !mAnimationController ||
                     mAnimationController->IsPausedByType(
                         nsSMILTimeContainer::PAUSE_PAGEHIDE |
                         nsSMILTimeContainer::PAUSE_BEGIN),
                     "Clearing window pointer while animations are unpaused");
-#endif // MOZ_SMIL
 
   if (mScriptGlobalObject && !aScriptGlobalObject) {
     // We're detaching from the window.  We need to grab a pointer to
@@ -5530,7 +5525,6 @@ nsDocument::EnumerateExternalResources(nsSubDocEnumFunc aCallback, void* aData)
   mExternalResourceMap.EnumerateResources(aCallback, aData);
 }
 
-#ifdef MOZ_SMIL
 nsSMILAnimationController*
 nsDocument::GetAnimationController()
 {
@@ -5565,7 +5559,6 @@ nsDocument::GetAnimationController()
 
   return mAnimationController;
 }
-#endif // MOZ_SMIL
 
 struct DirTable {
   const char* mName;
@@ -7274,11 +7267,9 @@ nsDocument::OnPageShow(bool aPersisted,
     mIsShowing = true;
   }
  
-#ifdef MOZ_SMIL
   if (mAnimationController) {
     mAnimationController->OnPageShow();
   }
-#endif
 
   if (aPersisted) {
     SetImagesNeedAnimating(true);
@@ -7301,6 +7292,21 @@ NotifyPageHide(nsIDocument* aDocument, void* aData)
   return true;
 }
 
+static bool
+SetFullScreenState(nsIDocument* aDoc, Element* aElement, bool aIsFullScreen);
+
+static void
+SetWindowFullScreen(nsIDocument* aDoc, bool aValue);
+
+static bool
+ResetFullScreen(nsIDocument* aDocument, void* aData) {
+  if (aDocument->IsFullScreenDoc()) {
+    ::SetFullScreenState(aDocument, nsnull, false);
+    aDocument->EnumerateSubDocuments(ResetFullScreen, nsnull);
+  }
+  return true;
+}
+
 void
 nsDocument::OnPageHide(bool aPersisted,
                        nsIDOMEventTarget* aDispatchStartTarget)
@@ -7329,11 +7335,9 @@ nsDocument::OnPageHide(bool aPersisted,
     mIsShowing = false;
   }
 
-#ifdef MOZ_SMIL
   if (mAnimationController) {
     mAnimationController->OnPageHide();
   }
-#endif
   
   if (aPersisted) {
     SetImagesNeedAnimating(false);
@@ -7352,6 +7356,29 @@ nsDocument::OnPageHide(bool aPersisted,
   
   EnumerateExternalResources(NotifyPageHide, &aPersisted);
   EnumerateFreezableElements(NotifyActivityChanged, nsnull);
+
+  if (IsFullScreenDoc()) {
+    // A full-screen doc has been hidden. We need to ensure we exit
+    // full-screen, i.e. remove full-screen state from all full-screen
+    // documents, and exit the top-level window from full-screen mode.
+    // Unfortunately by the time a doc is hidden, it has been removed
+    // from the doc tree, so we can't just call CancelFullScreen()...
+
+    // So firstly reset full-screen state in *this* document. OnPageHide()
+    // is called in every hidden document, so doing this ensures all hidden
+    // documents have their state reset.
+    ::SetFullScreenState(this, nsnull, false);
+
+    // Next walk the document tree of still visible documents, and reset
+    // their full-screen state. We then move the top-level window out
+    // of full-screen mode.
+    nsCOMPtr<nsIDocument> fullScreenRoot(do_QueryReferent(sFullScreenRootDoc));
+    if (fullScreenRoot) {
+      fullScreenRoot->EnumerateSubDocuments(ResetFullScreen, nsnull);
+      SetWindowFullScreen(fullScreenRoot, false);
+      sFullScreenRootDoc = nsnull;
+    }
+  }
 }
 
 void
@@ -8456,6 +8483,7 @@ nsDocument::CancelFullScreen()
     doc = doc->GetParentDocument();
   }
   sFullScreenDoc = nsnull;
+  sFullScreenRootDoc = nsnull;
 
   // Move the window out of full-screen mode.
   SetWindowFullScreen(this, false);
@@ -8500,18 +8528,66 @@ GetCommonAncestor(nsIDocument* aDoc1, nsIDocument* aDoc2)
   return parent;
 }
 
-void
-nsDocument::RequestFullScreen(Element* aElement)
+// Returns the root document in a document hierarchy.
+static nsIDocument*
+GetRootDocument(nsIDocument* aDoc)
 {
-  if (!aElement || !nsContentUtils::IsFullScreenApiEnabled() || !GetWindow()) {
-    if (aElement) {
-      nsRefPtr<nsPLDOMEvent> e =
-        new nsPLDOMEvent(aElement,
-                         NS_LITERAL_STRING("mozfullscreenerror"),
-                         true,
-                         false);
-      e->PostDOMEvent();
-    }
+  if (!aDoc)
+    return nsnull;
+  nsIDocument* doc = aDoc;
+  while (doc->GetParentDocument()) {
+    doc = doc->GetParentDocument();
+  }
+  return doc;
+}
+
+class nsCallRequestFullScreen : public nsRunnable
+{
+public:
+  nsCallRequestFullScreen(Element* aElement)
+    : mElement(aElement),
+      mDoc(aElement->OwnerDoc()),
+      mWasCallerChrome(nsContentUtils::IsCallerChrome())
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    nsDocument* doc = static_cast<nsDocument*>(mDoc.get());
+    doc->RequestFullScreen(mElement, mWasCallerChrome);
+    return NS_OK;
+  }
+
+  nsRefPtr<Element> mElement;
+  nsCOMPtr<nsIDocument> mDoc;
+  bool mWasCallerChrome;
+};
+
+void
+nsDocument::AsyncRequestFullScreen(Element* aElement)
+{
+  if (!aElement) {
+    return;
+  }
+  // Request full-screen asynchronously.
+  nsCOMPtr<nsIRunnable> event(new nsCallRequestFullScreen(aElement));
+  NS_DispatchToCurrentThread(event);
+}
+
+void
+nsDocument::RequestFullScreen(Element* aElement, bool aWasCallerChrome)
+{
+  if (!aElement ||
+      !aElement->IsInDoc() ||
+      aElement->OwnerDoc() != this ||
+      !IsFullScreenEnabled(aWasCallerChrome) ||
+      !GetWindow()) {
+    nsRefPtr<nsPLDOMEvent> e =
+      new nsPLDOMEvent(this,
+                       NS_LITERAL_STRING("mozfullscreenerror"),
+                       true,
+                       false);
+    e->PostDOMEvent();
     return;
   }
 
@@ -8538,6 +8614,10 @@ nsDocument::RequestFullScreen(Element* aElement)
     SetWindowFullScreen(fullScreenDoc, false);
   }
 
+  // Remember the root document, so that if a full-screen document is hidden
+  // we can reset full-screen state the remaining visible full-screen documents.
+  sFullScreenRootDoc = do_GetWeakReference(GetRootDocument(this));
+
   // Set the full-screen element. This sets the full-screen style on the
   // element, and the full-screen-ancestor styles on ancestors of the element
   // in this document.
@@ -8602,20 +8682,25 @@ NS_IMETHODIMP
 nsDocument::GetMozFullScreenEnabled(bool *aFullScreen)
 {
   NS_ENSURE_ARG_POINTER(aFullScreen);
-  *aFullScreen = false;
+  *aFullScreen = IsFullScreenEnabled(nsContentUtils::IsCallerChrome());
+  return NS_OK;
+}
 
-  if (nsContentUtils::IsCallerChrome() &&
-      nsContentUtils::IsFullScreenApiEnabled()) {
+bool
+nsDocument::IsFullScreenEnabled(bool aCallerIsChrome)
+{
+  if (nsContentUtils::IsFullScreenApiEnabled() && aCallerIsChrome) {
     // Chrome code can always use the full-screen API, provided it's not
-    // explicitly disabled.
-    *aFullScreen = true;
-    return NS_OK;
+    // explicitly disabled. Note IsCallerChrome() returns true when running
+    // in an nsRunnable, so don't use GetMozFullScreenEnabled() from an
+    // nsRunnable!
+    return true;
   }
 
   if (!nsContentUtils::IsFullScreenApiEnabled() ||
       nsContentUtils::HasPluginWithUncontrolledEventDispatch(this) ||
       !IsVisible()) {
-    return NS_OK;
+    return false;
   }
 
   // Ensure that all ancestor <iframe> elements have the mozallowfullscreen
@@ -8628,13 +8713,12 @@ nsDocument::GetMozFullScreenEnabled(bool *aFullScreen)
       // The node requesting fullscreen, or one of its crossdoc ancestors,
       // is an iframe which doesn't have the "mozalllowfullscreen" attribute.
       // This request is not authorized by the parent document.
-      return NS_OK;
+      return false;
     }
     node = nsContentUtils::GetCrossDocParentNode(node);
   } while (node);
 
-  *aFullScreen = true;
-  return NS_OK;
+  return true;
 }
 
 PRInt64
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index d3fabc94371..b0a60ae7522 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -865,11 +865,9 @@ public:
 
   nsTArray<nsCString> mFileDataUris;
 
-#ifdef MOZ_SMIL
   // Returns our (lazily-initialized) animation controller.
   // If HasAnimationController is true, this is guaranteed to return non-null.
   nsSMILAnimationController* GetAnimationController();
-#endif // MOZ_SMIL
 
   void SetImagesNeedAnimating(bool aAnimating);
 
@@ -952,10 +950,16 @@ public:
   virtual Element* FindImageMap(const nsAString& aNormalizedMapName);
 
   virtual Element* GetFullScreenElement();
-  virtual void RequestFullScreen(Element* aElement);
+  virtual void AsyncRequestFullScreen(Element* aElement);
   virtual void CancelFullScreen();
   virtual bool IsFullScreenDoc();
 
+  // This is called asynchronously by nsIDocument::AsyncRequestFullScreen()
+  // to move document into full-screen mode if allowed. aWasCallerChrome
+  // should be true when nsIDocument::AsyncRequestFullScreen() was called
+  // by chrome code.
+  void RequestFullScreen(Element* aElement, bool aWasCallerChrome);
+
   // Returns true if making this change results in a change in the full-screen
   // state of this document.
   bool SetFullScreenState(Element* aElement, bool aIsFullScreen);
@@ -969,6 +973,13 @@ public:
 protected:
   friend class nsNodeUtils;
 
+  // Returns true if a request for DOM full-screen is currently enabled in
+  // this document. This returns true if there are no windowed plugins in this
+  // doc tree, and if the document is visible, and if the api is not
+  // disabled by pref. aIsCallerChrome must contain the return value of
+  // nsContentUtils::IsCallerChrome() from the context we're checking.
+  bool IsFullScreenEnabled(bool aIsCallerChrome);
+
   /**
    * Check that aId is not empty and log a message to the console
    * service if it is.
@@ -1083,6 +1094,13 @@ protected:
   // of this document will also be full-screen.
   static nsWeakPtr sFullScreenDoc;
 
+  // The root document of the doctree containing the document which requested
+  // full-screen. This root document will also be in full-screen state, as will
+  // all the descendents down to the document which requested full-screen. This
+  // reference allows us to reset full-screen state on all documents when a
+  // document is hidden/navigation occurs.
+  static nsWeakPtr sFullScreenRootDoc;
+
   nsRefPtr<nsEventListenerManager> mListenerManager;
   nsCOMPtr<nsIDOMStyleSheetList> mDOMStyleSheets;
   nsRefPtr<nsDOMStyleSheetSetList> mStyleSheetSetList;
diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp
index e08c2950dc8..d3fbc413fbc 100644
--- a/content/base/src/nsGenericDOMDataNode.cpp
+++ b/content/base/src/nsGenericDOMDataNode.cpp
@@ -928,7 +928,6 @@ nsGenericDOMDataNode::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsIDOMCSSStyleDeclaration*
 nsGenericDOMDataNode::GetSMILOverrideStyle()
 {
@@ -948,7 +947,6 @@ nsGenericDOMDataNode::SetSMILOverrideStyleRule(css::StyleRule* aStyleRule,
   NS_NOTREACHED("How come we're setting SMILOverrideStyle on a non-element?");
   return NS_ERROR_UNEXPECTED;
 }
-#endif // MOZ_SMIL
 
 css::StyleRule*
 nsGenericDOMDataNode::GetInlineStyleRule()
diff --git a/content/base/src/nsGenericDOMDataNode.h b/content/base/src/nsGenericDOMDataNode.h
index 1034b26fe54..d656aed38a6 100644
--- a/content/base/src/nsGenericDOMDataNode.h
+++ b/content/base/src/nsGenericDOMDataNode.h
@@ -52,9 +52,7 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsDOMMemoryReporter.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 // This bit is set to indicate that if the text node changes to
 // non-whitespace, we may need to create a frame for it. This bit must
@@ -228,7 +226,6 @@ public:
   virtual void DestroyContent();
   virtual void SaveSubtreeState();
 
-#ifdef MOZ_SMIL
   virtual nsISMILAttr* GetAnimatedAttr(PRInt32 /*aNamespaceID*/, nsIAtom* /*aName*/)
   {
     return nsnull;
@@ -237,7 +234,6 @@ public:
   virtual mozilla::css::StyleRule* GetSMILOverrideStyleRule();
   virtual nsresult SetSMILOverrideStyleRule(mozilla::css::StyleRule* aStyleRule,
                                             bool aNotify);
-#endif // MOZ_SMIL
 
 #ifdef DEBUG
   virtual void List(FILE* out, PRInt32 aIndent) const;
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 7a37d375094..975662ac689 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2293,10 +2293,8 @@ nsGenericElement::nsDOMSlots::Traverse(nsCycleCollectionTraversalCallback &cb, b
   NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mSlots->mStyle");
   cb.NoteXPCOMChild(mStyle.get());
 
-#ifdef MOZ_SMIL
   NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mSlots->mSMILOverrideStyle");
   cb.NoteXPCOMChild(mSMILOverrideStyle.get());
-#endif // MOZ_SMIL
 
   NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mSlots->mAttributeMap");
   cb.NoteXPCOMChild(mAttributeMap.get());
@@ -2314,9 +2312,7 @@ void
 nsGenericElement::nsDOMSlots::Unlink(bool aIsXUL)
 {
   mStyle = nsnull;
-#ifdef MOZ_SMIL
   mSMILOverrideStyle = nsnull;
-#endif // MOZ_SMIL
   if (mAttributeMap) {
     mAttributeMap->DropReference();
     mAttributeMap = nsnull;
@@ -2456,13 +2452,11 @@ nsGenericElement::InternalIsSupported(nsISupports* aObject,
       *aReturn = true;
     }
   }
-#ifdef MOZ_SMIL
   else if (NS_SMILEnabled() && PL_strcasecmp(f, "TimeControl") == 0) {
     if (aVersion.IsEmpty() || PL_strcmp(v, "1.0") == 0) {
       *aReturn = true;
     }
   }
-#endif /* MOZ_SMIL */
 
   return NS_OK;
 }
@@ -3355,7 +3349,6 @@ nsGenericElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsIDOMCSSStyleDeclaration*
 nsGenericElement::GetSMILOverrideStyle()
 {
@@ -3398,7 +3391,6 @@ nsGenericElement::SetSMILOverrideStyleRule(css::StyleRule* aStyleRule,
 
   return NS_OK;
 }
-#endif // MOZ_SMIL
 
 css::StyleRule*
 nsGenericElement::GetInlineStyleRule()
diff --git a/content/base/src/nsGenericElement.h b/content/base/src/nsGenericElement.h
index 6ab843b020c..0098db61e74 100644
--- a/content/base/src/nsGenericElement.h
+++ b/content/base/src/nsGenericElement.h
@@ -67,9 +67,7 @@
 #include "nsIDOMTouchEvent.h"
 #include "nsIInlineEventHandlers.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 class nsIDOMAttr;
 class nsIDOMEventListener;
@@ -349,7 +347,6 @@ public:
   virtual void DestroyContent();
   virtual void SaveSubtreeState();
 
-#ifdef MOZ_SMIL
   virtual nsISMILAttr* GetAnimatedAttr(PRInt32 /*aNamespaceID*/, nsIAtom* /*aName*/)
   {
     return nsnull;
@@ -358,7 +355,6 @@ public:
   virtual mozilla::css::StyleRule* GetSMILOverrideStyleRule();
   virtual nsresult SetSMILOverrideStyleRule(mozilla::css::StyleRule* aStyleRule,
                                             bool aNotify);
-#endif // MOZ_SMIL
 
 #ifdef DEBUG
   virtual void List(FILE* out, PRInt32 aIndent) const
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index 39171d5b71e..1742fb571b9 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -1368,7 +1368,6 @@ GK_ATOM(yChannelSelector, "yChannelSelector")
 GK_ATOM(z, "z")
 GK_ATOM(zoomAndPan, "zoomAndPan")
 
-#ifdef MOZ_SMIL
 GK_ATOM(accumulate, "accumulate")
 GK_ATOM(additive, "additive")
 GK_ATOM(attributeName, "attributeName")
@@ -1395,7 +1394,6 @@ GK_ATOM(repeatEvent, "repeatEvent")
 GK_ATOM(restart, "restart")
 GK_ATOM(to, "to")
 GK_ATOM(XML, "XML")
-#endif
 
 // internal MathML attributes: different from columnalign_, columnlines_,
 // fontstyle_, rowalign_ and rowlines_
diff --git a/content/base/src/nsPlainTextSerializer.cpp b/content/base/src/nsPlainTextSerializer.cpp
index 65a91f42ed9..dfdf4b5270c 100644
--- a/content/base/src/nsPlainTextSerializer.cpp
+++ b/content/base/src/nsPlainTextSerializer.cpp
@@ -307,8 +307,6 @@ nsPlainTextSerializer::AppendText(nsIContent* aText,
   NS_ENSURE_ARG(aText);
 
   nsresult rv = NS_OK;
-  PRInt32 length = 0;
-  nsAutoString textstr;
 
   nsIContent* content = aText;
   const nsTextFragment* frag;
@@ -319,16 +317,19 @@ nsPlainTextSerializer::AppendText(nsIContent* aText,
   PRInt32 endoffset = (aEndOffset == -1) ? frag->GetLength() : aEndOffset;
   NS_ASSERTION(aStartOffset <= endoffset, "A start offset is beyond the end of the text fragment!");
 
-  length = endoffset - aStartOffset;
+  PRInt32 length = endoffset - aStartOffset;
   if (length <= 0) {
     return NS_OK;
   }
 
+  nsAutoString textstr;
   if (frag->Is2b()) {
     textstr.Assign(frag->Get2b() + aStartOffset, length);
   }
   else {
-    textstr.AssignWithConversion(frag->Get1b()+aStartOffset, length);
+    // AssignASCII is for 7-bit character only, so don't use it
+    const char *data = frag->Get1b();
+    CopyASCIItoUTF16(Substring(data + aStartOffset, data + endoffset), textstr);
   }
 
   mOutputString = &aStr;
diff --git a/content/base/src/nsStyledElement.cpp b/content/base/src/nsStyledElement.cpp
index 8af63ed9dee..e4f000fd412 100644
--- a/content/base/src/nsStyledElement.cpp
+++ b/content/base/src/nsStyledElement.cpp
@@ -271,11 +271,7 @@ nsStyledElementNotElementCSSInlineStyle::GetStyle(nsresult* retval)
     // Just in case...
     ReparseStyleAttribute(true);
 
-    slots->mStyle = new nsDOMCSSAttributeDeclaration(this
-#ifdef MOZ_SMIL
-                                                     , false
-#endif // MOZ_SMIL
-                                                     );
+    slots->mStyle = new nsDOMCSSAttributeDeclaration(this, false);
     SetMayHaveStyle();
   }
 
diff --git a/content/base/src/nsTreeSanitizer.cpp b/content/base/src/nsTreeSanitizer.cpp
index f922b6ad546..1222d732f76 100644
--- a/content/base/src/nsTreeSanitizer.cpp
+++ b/content/base/src/nsTreeSanitizer.cpp
@@ -323,7 +323,6 @@ nsIAtom** const kURLAttributesHTML[] = {
 };
 
 nsIAtom** const kElementsSVG[] = {
-#ifdef MOZ_SVG
   &nsGkAtoms::a, // a
   &nsGkAtoms::altGlyph, // altGlyph
   &nsGkAtoms::altGlyphDef, // altGlyphDef
@@ -407,39 +406,29 @@ nsIAtom** const kElementsSVG[] = {
   &nsGkAtoms::use, // use
   &nsGkAtoms::view, // view
   &nsGkAtoms::vkern, // vkern
-#endif
   nsnull
 };
 
 nsIAtom** const kAttributesSVG[] = {
-#ifdef MOZ_SVG
   // accent-height
-#ifdef MOZ_SMIL
   &nsGkAtoms::accumulate, // accumulate
   &nsGkAtoms::additive, // additive
-#endif
   &nsGkAtoms::alignment_baseline, // alignment-baseline
   // alphabetic
   &nsGkAtoms::amplitude, // amplitude
   // arabic-form
   // ascent
-#ifdef MOZ_SMIL
   &nsGkAtoms::attributeName, // attributeName
   &nsGkAtoms::attributeType, // attributeType
-#endif
   &nsGkAtoms::azimuth, // azimuth
   &nsGkAtoms::baseFrequency, // baseFrequency
   &nsGkAtoms::baseline_shift, // baseline-shift
   // baseProfile
   // bbox
-#ifdef MOZ_SMIL
   &nsGkAtoms::begin, // begin
-#endif
   &nsGkAtoms::bias, // bias
-#ifdef MOZ_SMIL
   &nsGkAtoms::by, // by
   &nsGkAtoms::calcMode, // calcMode
-#endif
   // cap-height
   &nsGkAtoms::_class, // class
   &nsGkAtoms::clip_path, // clip-path
@@ -460,17 +449,13 @@ nsIAtom** const kAttributesSVG[] = {
   &nsGkAtoms::display, // display
   &nsGkAtoms::divisor, // divisor
   &nsGkAtoms::dominant_baseline, // dominant-baseline
-#ifdef MOZ_SMIL
   &nsGkAtoms::dur, // dur
-#endif
   &nsGkAtoms::dx, // dx
   &nsGkAtoms::dy, // dy
   &nsGkAtoms::edgeMode, // edgeMode
   &nsGkAtoms::elevation, // elevation
   // enable-background
-#ifdef MOZ_SMIL
   &nsGkAtoms::end, // end
-#endif
   &nsGkAtoms::fill, // fill
   &nsGkAtoms::fill_opacity, // fill-opacity
   &nsGkAtoms::fill_rule, // fill-rule
@@ -518,11 +503,9 @@ nsIAtom** const kAttributesSVG[] = {
   &nsGkAtoms::kerning, // kerning
   &nsGkAtoms::kernelMatrix, // kernelMatrix
   &nsGkAtoms::kernelUnitLength, // kernelUnitLength
-#ifdef MOZ_SMIL
   &nsGkAtoms::keyPoints, // keyPoints
   &nsGkAtoms::keySplines, // keySplines
   &nsGkAtoms::keyTimes, // keyTimes
-#endif
   &nsGkAtoms::lang, // lang
   // lengthAdjust
   &nsGkAtoms::letter_spacing, // letter-spacing
@@ -575,15 +558,11 @@ nsIAtom** const kAttributesSVG[] = {
   &nsGkAtoms::radius, // radius
   &nsGkAtoms::refX, // refX
   &nsGkAtoms::refY, // refY
-#ifdef MOZ_SMIL
   &nsGkAtoms::repeatCount, // repeatCount
   &nsGkAtoms::repeatDur, // repeatDur
-#endif
   &nsGkAtoms::requiredExtensions, // requiredExtensions
   &nsGkAtoms::requiredFeatures, // requiredFeatures
-#ifdef MOZ_SMIL
   &nsGkAtoms::restart, // restart
-#endif
   &nsGkAtoms::result, // result
   &nsGkAtoms::rotate, // rotate
   &nsGkAtoms::rx, // rx
@@ -625,9 +604,7 @@ nsIAtom** const kAttributesSVG[] = {
   // textLength
   &nsGkAtoms::text_rendering, // text-rendering
   &nsGkAtoms::title, // title
-#ifdef MOZ_SMIL
   &nsGkAtoms::to, // to
-#endif
   &nsGkAtoms::transform, // transform
   &nsGkAtoms::type, // type
   // u1
@@ -664,7 +641,6 @@ nsIAtom** const kAttributesSVG[] = {
   &nsGkAtoms::yChannelSelector, // yChannelSelector
   &nsGkAtoms::z, // z
   &nsGkAtoms::zoomAndPan, // zoomAndPan
-#endif
   nsnull
 };
 
diff --git a/content/events/public/nsEventNameList.h b/content/events/public/nsEventNameList.h
index a202dbc68ff..7b6e5fe88f7 100644
--- a/content/events/public/nsEventNameList.h
+++ b/content/events/public/nsEventNameList.h
@@ -648,7 +648,6 @@ NON_IDL_EVENT(zoom,
               NS_SVG_ZOOM,
               EventNameType_SVGSVG,
               NS_EVENT_NULL)
-#ifdef MOZ_SMIL
 NON_IDL_EVENT(begin,
               NS_SMIL_BEGIN,
               EventNameType_SMIL,
@@ -673,7 +672,6 @@ NON_IDL_EVENT(repeatEvent,
               NS_SMIL_REPEAT,
               EventNameType_None,
               NS_SMIL_TIME_EVENT)
-#endif // MOZ_SMIL
 
 NON_IDL_EVENT(MozAudioAvailable,
               NS_MOZAUDIOAVAILABLE,
diff --git a/content/events/public/nsIPrivateDOMEvent.h b/content/events/public/nsIPrivateDOMEvent.h
index a0cb1e7d852..0a4c447c21f 100644
--- a/content/events/public/nsIPrivateDOMEvent.h
+++ b/content/events/public/nsIPrivateDOMEvent.h
@@ -105,10 +105,8 @@ nsresult
 NS_NewDOMSVGEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsEvent* aEvent);
 nsresult
 NS_NewDOMSVGZoomEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsGUIEvent* aEvent);
-#ifdef MOZ_SMIL
 nsresult
 NS_NewDOMTimeEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsEvent* aEvent);
-#endif // MOZ_SMIL
 nsresult
 NS_NewDOMXULCommandEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsInputEvent* aEvent);
 nsresult
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index ffd5802de55..059b6e747c1 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -85,9 +85,7 @@ static const char* const sEventNames[] = {
   "offline", "online", "copy", "cut", "paste", "open", "message", "show",
   "SVGLoad", "SVGUnload", "SVGAbort", "SVGError", "SVGResize", "SVGScroll",
   "SVGZoom",
-#ifdef MOZ_SMIL
   "beginEvent", "endEvent", "repeatEvent",
-#endif // MOZ_SMIL
 #ifdef MOZ_MEDIA
   "loadstart", "progress", "suspend", "emptied", "stalled", "play", "pause",
   "loadedmetadata", "loadeddata", "waiting", "playing", "canplay",
@@ -422,6 +420,14 @@ nsDOMEvent::StopPropagation()
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDOMEvent::StopImmediatePropagation()
+{
+  mEvent->flags |=
+    (NS_EVENT_FLAG_STOP_DISPATCH_IMMEDIATELY | NS_EVENT_FLAG_STOP_DISPATCH);
+  return NS_OK;
+}
+
 static nsIDocument* GetDocumentForReport(nsEvent* aEvent)
 {
   nsCOMPtr<nsINode> node = do_QueryInterface(aEvent->currentTarget);
@@ -796,7 +802,6 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
       newEvent->eventStructType = NS_SVGZOOM_EVENT;
       break;
     }
-#ifdef MOZ_SMIL
     case NS_SMIL_TIME_EVENT:
     {
       newEvent = new nsUIEvent(false, msg, 0);
@@ -804,7 +809,6 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
       newEvent->eventStructType = NS_SMIL_TIME_EVENT;
       break;
     }
-#endif // MOZ_SMIL
     case NS_SIMPLE_GESTURE_EVENT:
     {
       nsSimpleGestureEvent* oldSimpleGestureEvent = static_cast<nsSimpleGestureEvent*>(mEvent);
@@ -1287,14 +1291,12 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
     return sEventNames[eDOMEvents_SVGScroll];
   case NS_SVG_ZOOM:
     return sEventNames[eDOMEvents_SVGZoom];
-#ifdef MOZ_SMIL
   case NS_SMIL_BEGIN:
     return sEventNames[eDOMEvents_beginEvent];
   case NS_SMIL_END:
     return sEventNames[eDOMEvents_endEvent];
   case NS_SMIL_REPEAT:
     return sEventNames[eDOMEvents_repeatEvent];
-#endif // MOZ_SMIL
 #ifdef MOZ_MEDIA
   case NS_LOADSTART:
     return sEventNames[eDOMEvents_loadstart];
diff --git a/content/events/src/nsDOMEvent.h b/content/events/src/nsDOMEvent.h
index 4455a088b26..dd6c63d4db4 100644
--- a/content/events/src/nsDOMEvent.h
+++ b/content/events/src/nsDOMEvent.h
@@ -149,11 +149,9 @@ public:
     eDOMEvents_SVGResize,
     eDOMEvents_SVGScroll,
     eDOMEvents_SVGZoom,
-#ifdef MOZ_SMIL
     eDOMEvents_beginEvent,
     eDOMEvents_endEvent,
     eDOMEvents_repeatEvent,
-#endif // MOZ_SMIL
 #ifdef MOZ_MEDIA
     eDOMEvents_loadstart,
     eDOMEvents_progress,
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
index e0b5b8295f2..00f1188c894 100644
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -376,9 +376,9 @@ nsEventTargetChainItem::HandleEventTargetChain(nsEventChainPostVisitor& aVisitor
 
   if (!(aFlags & NS_EVENT_FLAG_SYSTEM_EVENT)) {
     // Dispatch to the system event group.  Make sure to clear the
-    // STOP_DISPATCH flag since this resets for each event group
-    // per DOM3 Events.
-    aVisitor.mEvent->flags &= ~NS_EVENT_FLAG_STOP_DISPATCH;
+    // STOP_DISPATCH flag since this resets for each event group.
+    aVisitor.mEvent->flags &=
+      ~(NS_EVENT_FLAG_STOP_DISPATCH | NS_EVENT_FLAG_STOP_DISPATCH_IMMEDIATELY);
 
     // Setting back the original target of the event.
     aVisitor.mEvent->target = aVisitor.mEvent->originalTarget;
@@ -396,6 +396,11 @@ nsEventTargetChainItem::HandleEventTargetChain(nsEventChainPostVisitor& aVisitor
                            aCallback,
                            createdELMs != nsEventListenerManager::sCreatedCount,
                            aPusher);
+
+    // After dispatch, clear all the propagation flags so that
+    // system group listeners don't affect to the event.
+    aVisitor.mEvent->flags &=
+      ~(NS_EVENT_FLAG_STOP_DISPATCH | NS_EVENT_FLAG_STOP_DISPATCH_IMMEDIATELY);
   }
 
   return NS_OK;
@@ -787,10 +792,8 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
     case NS_SVGZOOM_EVENT:
       return NS_NewDOMSVGZoomEvent(aDOMEvent, aPresContext,
                                    static_cast<nsGUIEvent*>(aEvent));
-#ifdef MOZ_SMIL
     case NS_SMIL_TIME_EVENT:
       return NS_NewDOMTimeEvent(aDOMEvent, aPresContext, aEvent);
-#endif // MOZ_SMIL
 
     case NS_COMMAND_EVENT:
       return NS_NewDOMCommandEvent(aDOMEvent, aPresContext,
@@ -854,11 +857,9 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
   if (aEventType.LowerCaseEqualsLiteral("svgzoomevent") ||
       aEventType.LowerCaseEqualsLiteral("svgzoomevents"))
     return NS_NewDOMSVGZoomEvent(aDOMEvent, aPresContext, nsnull);
-#ifdef MOZ_SMIL
   if (aEventType.LowerCaseEqualsLiteral("timeevent") ||
       aEventType.LowerCaseEqualsLiteral("timeevents"))
     return NS_NewDOMTimeEvent(aDOMEvent, aPresContext, nsnull);
-#endif // MOZ_SMIL
   if (aEventType.LowerCaseEqualsLiteral("xulcommandevent") ||
       aEventType.LowerCaseEqualsLiteral("xulcommandevents"))
     return NS_NewDOMXULCommandEvent(aDOMEvent, aPresContext, nsnull);
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index 5692649c3af..0d9a752e1a8 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -624,14 +624,12 @@ nsEventListenerManager::CompileEventHandlerInternal(nsListenerStruct *aListenerS
         attrName = nsGkAtoms::onscroll;
       else if (aListenerStruct->mTypeAtom == nsGkAtoms::onSVGZoom)
         attrName = nsGkAtoms::onzoom;
-#ifdef MOZ_SMIL
       else if (aListenerStruct->mTypeAtom == nsGkAtoms::onbeginEvent)
         attrName = nsGkAtoms::onbegin;
       else if (aListenerStruct->mTypeAtom == nsGkAtoms::onrepeatEvent)
         attrName = nsGkAtoms::onrepeat;
       else if (aListenerStruct->mTypeAtom == nsGkAtoms::onendEvent)
         attrName = nsGkAtoms::onend;
-#endif // MOZ_SMIL
 
       content->GetAttr(kNameSpaceID_None, attrName, handlerBody);
       body = &handlerBody;
@@ -764,6 +762,9 @@ nsEventListenerManager::HandleEventInternal(nsPresContext* aPresContext,
   nsAutoPopupStatePusher popupStatePusher(nsDOMEvent::GetEventPopupControlState(aEvent));
   bool hasListener = false;
   while (iter.HasMore()) {
+    if (aEvent->flags & NS_EVENT_FLAG_STOP_DISPATCH_IMMEDIATELY) {
+      break;
+    }
     nsListenerStruct* ls = &iter.GetNext();
     // Check that the phase is same in event and event listener.
     // Handle only trusted events, except when listener permits untrusted events.
diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in
index 22155be630f..707613f0146 100644
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -111,6 +111,7 @@ _TEST_FILES = \
 		test_bug667612.html \
 		empty.js \
 		test_bug689564.html \
+		test_bug698929.html \
 		$(NULL)
 
 #bug 585630
diff --git a/content/events/test/test_bug698929.html b/content/events/test/test_bug698929.html
new file mode 100644
index 00000000000..03c2ff0811a
--- /dev/null
+++ b/content/events/test/test_bug698929.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=698929
+-->
+<head>
+  <title>Test for Bug 698929</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=698929">Mozilla Bug 698929</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 698929 **/
+
+  var e = document.createEvent("Event");
+  e.initEvent("foo", true, true);
+  var c = 0;
+  var b = 0;
+  document.addEventListener("foo",
+    function() {
+      ++c;
+    });
+  document.body.addEventListener("foo", function(e) {
+    ++b;
+    e.stopImmediatePropagation();
+  });
+  document.body.addEventListener("foo", function(e) {
+    ++b;
+  });
+  document.body.dispatchEvent(e);
+  document.documentElement.dispatchEvent(e);
+  is(c, 1, "Listener in the document should have been called once.");
+  is(b, 1, "Listener in the body should have been called once.");
+
+
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index c41354ac99d..c764eaeb5b6 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -3404,11 +3404,9 @@ nsresult nsGenericHTMLElement::MozRequestFullScreen()
   // This stops the full-screen from being abused similar to the popups of old,
   // and it also makes it harder for bad guys' script to go full-screen and
   // spoof the browser chrome/window and phish logins etc.
-  nsIDocument* doc = OwnerDoc();
-  if (!nsContentUtils::IsRequestFullScreenAllowed() ||
-      !IsInDoc()) {
+  if (!nsContentUtils::IsRequestFullScreenAllowed()) {
     nsRefPtr<nsPLDOMEvent> e =
-      new nsPLDOMEvent(this,
+      new nsPLDOMEvent(OwnerDoc(),
                        NS_LITERAL_STRING("mozfullscreenerror"),
                        true,
                        false);
@@ -3416,27 +3414,8 @@ nsresult nsGenericHTMLElement::MozRequestFullScreen()
     return NS_OK;
   }
 
-  nsCOMPtr<nsIDOMDocument> domDocument(do_QueryInterface(doc));
-  NS_ENSURE_STATE(domDocument);
-  bool fullScreenEnabled;
-  domDocument->GetMozFullScreenEnabled(&fullScreenEnabled);
-  if (!fullScreenEnabled) {
-    nsRefPtr<nsPLDOMEvent> e =
-      new nsPLDOMEvent(this,
-                       NS_LITERAL_STRING("mozfullscreenerror"),
-                       true,
-                       false);
-    e->PostDOMEvent();
-    return NS_OK;
-  }
+  OwnerDoc()->AsyncRequestFullScreen(this);
 
-  doc->RequestFullScreen(this);
-#ifdef DEBUG
-  bool fullscreen;
-  domDocument->GetMozFullScreen(&fullscreen);
-  NS_ASSERTION(fullscreen, "Document should report fullscreen");
-  NS_ASSERTION(doc->IsFullScreenDoc(), "Should be in full screen state!");
-#endif
   return NS_OK;
 }
 
diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 38b6bcddc00..104a8c7847e 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -283,7 +283,9 @@ _TEST_FILES = \
 		test_fullscreen-api.html \
 		file_fullscreen-plugins.html \
 		file_fullscreen-denied.html \
+		file_fullscreen-denied-inner.html \
 		file_fullscreen-hidden.html \
+		file_fullscreen-navigation.html \
 		test_li_attributes_reflection.html \
 		test_ol_attributes_reflection.html \
 		test_bug651956.html \
diff --git a/content/html/content/test/file_fullscreen-api-keys.html b/content/html/content/test/file_fullscreen-api-keys.html
index 8770445b74c..888828b36fd 100644
--- a/content/html/content/test/file_fullscreen-api-keys.html
+++ b/content/html/content/test/file_fullscreen-api-keys.html
@@ -94,15 +94,19 @@ function testNextKey() {
   if (!document.mozFullScreen) {
     document.body.mozRequestFullScreen();
   }
-  ok(document.mozFullScreen, "Must be in full-screen mode");
+  // mozRequestFullScreen() is async...
+  setTimeout(
+    function() {
+      ok(document.mozFullScreen, "Must be in full-screen mode");
 
-  gKeyName = keyList[gKeyTestIndex].code;
-  gKeyCode = KeyEvent["DOM_" + gKeyName];
-  gKeySuppressed = keyList[gKeyTestIndex].suppressed;
-  gKeyTestIndex++;
+      gKeyName = keyList[gKeyTestIndex].code;
+      gKeyCode = KeyEvent["DOM_" + gKeyName];
+      gKeySuppressed = keyList[gKeyTestIndex].suppressed;
+      gKeyTestIndex++;
 
-  testScriptInitiatedKeyEvents();
-  testTrustedKeyEvents();
+      testScriptInitiatedKeyEvents();
+      testTrustedKeyEvents();
+    }, 0);
 }
 
 window.addEventListener("keydown", keyHandler, true);
diff --git a/content/html/content/test/file_fullscreen-api.html b/content/html/content/test/file_fullscreen-api.html
index 7ff50917ee4..5776cb2b618 100644
--- a/content/html/content/test/file_fullscreen-api.html
+++ b/content/html/content/test/file_fullscreen-api.html
@@ -98,18 +98,23 @@ function fullScreenChange(event) {
         "Full-screen element should be iframe element.");
       var fse = fullScreenElement();
       fse.mozRequestFullScreen();
-      ok(document.mozFullScreen, "Should still be full-screen mode after re-requesting.");
-      is(document.mozFullScreenElement, fse, "Full-screen element should have switched to requestee.");
-      var _innerFrame = iframe.contentDocument.getElementById("inner-frame");
-      _innerFrame.contentDocument.body.appendChild(fse);
-      ok(!document.mozFullScreen, "Should exit full-screen after transplanting FSE");
-      is(document.mozFullScreenElement, null, "Full-screen element transplanted, should be null.");
-      is(iframe.contentDocument.mozFullScreenElement, null, "Full-screen element in outer frame should be null.");
-      is(_innerFrame.contentDocument.mozFullScreenElement, null, "Full-screen element in inner frame should be null.");
-      ok(!iframe.contentDocument.mozFullScreen, "Outer frame should not acquire full-screen status.");
-      ok(!_innerFrame.contentDocument.mozFullScreen, "Inner frame should not acquire full-screen status.");
       
-      document.body.appendChild(fse);
+      setTimeout(
+        function() {
+          ok(document.mozFullScreen, "Should still be full-screen mode after re-requesting.");
+          is(document.mozFullScreenElement, fse, "Full-screen element should have switched to requestee.");
+          var _innerFrame = iframe.contentDocument.getElementById("inner-frame");
+          _innerFrame.contentDocument.body.appendChild(fse);
+          ok(!document.mozFullScreen, "Should exit full-screen after transplanting FSE");
+          is(document.mozFullScreenElement, null, "Full-screen element transplanted, should be null.");
+          is(iframe.contentDocument.mozFullScreenElement, null, "Full-screen element in outer frame should be null.");
+          is(_innerFrame.contentDocument.mozFullScreenElement, null, "Full-screen element in inner frame should be null.");
+          ok(!iframe.contentDocument.mozFullScreen, "Outer frame should not acquire full-screen status.");
+          ok(!_innerFrame.contentDocument.mozFullScreen, "Inner frame should not acquire full-screen status.");
+          
+          document.body.appendChild(fse);
+        }, 0);
+      
       break;
     }
     case 3: {
@@ -119,17 +124,25 @@ function fullScreenChange(event) {
       is(document.mozFullScreenElement, null, "Full-screen element should be null.");
       document.body.removeChild(iframe);
       iframe = null;
-      outOfDocElement = document.createElement("div");
-      outOfDocElement.mozRequestFullScreen();
-      ok(!document.mozFullScreen, "Requests for full-screen from not-in-doc elements should fail.");
-
-      container = document.createElement("div");
-      inDocElement = document.createElement("div");
-      container.appendChild(inDocElement);
-      fullScreenElement().appendChild(container);
       
-      inDocElement.mozRequestFullScreen();
-      ok(document.mozFullScreen, "Should grant request to return to full-screen mode (third time)");
+      // Do a request out of document. It should be denied.
+      // Continue test in the following mozfullscreenerror handler.
+      outOfDocElement = document.createElement("div");
+      var f =
+      function(e) {
+        document.removeEventListener("mozfullscreenerror", f, false);
+        ok(!document.mozFullScreen, "Requests for full-screen from not-in-doc elements should fail.");
+
+        container = document.createElement("div");
+        inDocElement = document.createElement("div");
+        container.appendChild(inDocElement);
+        fullScreenElement().appendChild(container);
+        
+        inDocElement.mozRequestFullScreen();
+      };
+      document.addEventListener("mozfullscreenerror", f, false);
+      outOfDocElement.mozRequestFullScreen();
+
       break;
     }
     case 4: {
@@ -157,11 +170,11 @@ function fullScreenChange(event) {
       setRequireTrustedContext(true);
       fullscreendenied = false;
       fullScreenElement().mozRequestFullScreen();
-      ok(!document.mozFullScreen, "Should still be in normal mode, because calling context isn't trusted.");
 
       setTimeout(
         function() {
           ok(fullscreendenied, "Request for fullscreen should have been denied because calling context isn't trusted");
+          ok(!document.mozFullScreen, "Should still be in normal mode, because calling context isn't trusted.");
           button = document.createElement("button");
           button.onclick = function(){fullScreenElement().mozRequestFullScreen();}
           fullScreenElement().appendChild(button);
diff --git a/content/html/content/test/file_fullscreen-denied-inner.html b/content/html/content/test/file_fullscreen-denied-inner.html
new file mode 100644
index 00000000000..9f37f752a58
--- /dev/null
+++ b/content/html/content/test/file_fullscreen-denied-inner.html
@@ -0,0 +1,22 @@
+<html>
+  <body onload='foo();'>
+  <script>
+    function foo() {
+      document.addEventListener('mozfullscreenerror',
+        function() {
+          parent.ok(true, "Request from an iframe without mozallowfullscreen should be denied");
+          parent.finish();
+        },
+        false);
+      document.addEventListener('mozfullscreenchange',
+        function() {
+          parent.ok(false, "Request from an iframe without mozallowfullscreen should be denied, but was granted!");
+          parent.finish();
+        },
+        false);
+      parent.is(document.mozFullScreenEnabled, false, "Full-screen should not be enabled, coz mozallowfullscreen isn't present.");
+      document.body.mozRequestFullScreen();    
+    }
+  </script>
+  </body>
+</html>
diff --git a/content/html/content/test/file_fullscreen-denied.html b/content/html/content/test/file_fullscreen-denied.html
index 8fe56bb2c93..39f664f347b 100644
--- a/content/html/content/test/file_fullscreen-denied.html
+++ b/content/html/content/test/file_fullscreen-denied.html
@@ -29,14 +29,6 @@ function is(a, b, msg) {
   opener.is(a, b, msg);
 }
 
-/*
-<html>
-  <body onload='document.body.mozRequestFullScreen();'>
-  </body>
-</html>
-*/
-var requestFullScreenContents = "data:text/html;charset=utf-8,<html>%0D%0A  <body onload%3D'document.body.mozRequestFullScreen()%3B'>%0D%0A  <%2Fbody>%0D%0A<%2Fhtml>";
-
 var fullscreendenied = false;
 
 document.addEventListener("mozfullscreenerror", function(){fullscreendenied=true;}, false);
@@ -54,8 +46,8 @@ function run() {
   // Request full-screen from a non trusted context (this script isn't a user
   // generated event!).
   SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", true);
-  document.body.mozRequestFullScreen();
   fullscreendenied = false;
+  document.body.mozRequestFullScreen();
   setTimeout(
     function() {
       ok(!document.mozFullScreen, "Should not grant request in non-truested context");
@@ -87,21 +79,20 @@ function keyHandler(event) {
       // to write.
       SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false);  
       
-      // Create an iframe without a mozallowfullscreen sttribute, whose contents requests
+      // Create an iframe without a mozallowfullscreen attribute, whose contents requests
       // full-screen. The request should be denied, and we should not receive a fullscreenchange
       // event in this document.
       var iframe = document.createElement("iframe");
-      iframe.src = requestFullScreenContents;
+      iframe.src = "file_fullscreen-denied-inner.html";
       document.body.appendChild(iframe);
-     
-      setTimeout(
-        function() {
-          ok(!gotFullScreenChange, "Should not ever grant a fullscreen request in this doc.");
-          opener.nextTest();
-        }, 0);
     }, 0);
 }
 
+function finish() {
+  ok(!gotFullScreenChange, "Should not ever grant a fullscreen request in this doc.");
+  opener.nextTest();
+}
+
 </script>
 </pre>
 <div id="full-screen-element"></div>
diff --git a/content/html/content/test/file_fullscreen-navigation.html b/content/html/content/test/file_fullscreen-navigation.html
new file mode 100644
index 00000000000..cb495a56a22
--- /dev/null
+++ b/content/html/content/test/file_fullscreen-navigation.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=685402
+-->
+<head>
+  <title>Test for Bug 685402</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="boom();" style="background-color: gray;">
+
+<iframe id="f" src="data:text/html,<body text=green>1" mozallowfullscreen></iframe>
+
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685402">Mozilla Bug 685402</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 685402 **/
+
+var frameWin;
+var e1;
+var prevEnabled;
+var prevTrusted;
+
+function boom()
+{
+  frameWin = document.getElementById("f").contentWindow;
+  e1 = frameWin.document.body;
+  e1.mozRequestFullScreen();
+  setTimeout(
+    function() {
+      opener.ok(document.mozFullScreen, "Request should be granted");
+      frameWin.location = "data:text/html,<body text=blue onload='parent.b2()'>2";
+    }, 0);
+}
+
+function b2()
+{
+  opener.ok(!document.mozFullScreen, "Should have left full-screen due to navigation.");
+  opener.nextTest();
+}
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/content/test/file_fullscreen-plugins.html b/content/html/content/test/file_fullscreen-plugins.html
index 9b4022e5c7d..97ad9d30354 100644
--- a/content/html/content/test/file_fullscreen-plugins.html
+++ b/content/html/content/test/file_fullscreen-plugins.html
@@ -74,15 +74,26 @@ function startTest() {
     // Running on MacOS, all plugins are effectively windowless, request for full-screen should be granted.
     // Continue test in the (mac-specific) "mozfullscreenchange" handler.
     return;
+  } else {
+    // Non-MacOS, request should be denied, carry on the test after receiving error event.
+    document.addEventListener("mozfullscreenerror", nonMacTest, false);
   }
+}
 
+function nonMacTest() {
+  document.removeEventListener("mozfullscreenerror", nonMacTest, false);
   ok(!document.mozFullScreen, "Request for full-screen from a document containing windowed plugin should be denied.");
 
   // Remove plugin in this document. Should still be a windowed plugin in sub-document.
   windowedPlugin = document.getElementById("windowed-plugin");
   windowedPlugin.parentNode.removeChild(windowedPlugin);
 
+  document.addEventListener("mozfullscreenerror", nonMacTest2, false);
   document.body.mozRequestFullScreen();
+}
+
+function nonMacTest2() {
+  document.removeEventListener("mozfullscreenerror", nonMacTest2, false);
   ok(!document.mozFullScreen, "Request for full-screen from a document with subdocument containing windowed plugin should be denied.");
   // Remove subdoc which contains windowed plugin, request full-screen, request should be granted.
   // Continue test in "mozfullscreenchange" handler.
diff --git a/content/html/content/test/test_fullscreen-api.html b/content/html/content/test/test_fullscreen-api.html
index 1e64612f50d..60e95671d17 100644
--- a/content/html/content/test/test_fullscreen-api.html
+++ b/content/html/content/test/test_fullscreen-api.html
@@ -40,7 +40,8 @@ var gTestWindows = [
   "file_fullscreen-api.html",
   "file_fullscreen-api-keys.html",
   "file_fullscreen-plugins.html",
-  "file_fullscreen-hidden.html"
+  "file_fullscreen-hidden.html",
+  "file_fullscreen-navigation.html"
 ];
 
 var testWindow = null;
diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in
index a9de7ba9572..232791b4943 100644
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -46,14 +46,21 @@ MODULE		= content
 LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 
+EXPORTS	= \
+	nsISMILAnimationElement.h \
+	nsISMILAttr.h \
+	nsISMILType.h \
+	nsSMILAnimationController.h \
+	nsSMILCompositorTable.h \
+	nsSMILCSSProperty.h \
+	nsSMILKeySpline.h \
+	nsSMILMappedAttribute.h \
+	nsSMILMilestone.h \
+	nsSMILTimeContainer.h \
+	nsSMILTypes.h \
+	$(NULL)
 
-# nsSMILKeySpline is used by CSS transitions -- need to build it regardless
-# of whether SMIL is enabled.
-CPPSRCS		= nsSMILKeySpline.cpp
-EXPORTS		= nsSMILKeySpline.h
-
-ifdef MOZ_SMIL
-CPPSRCS		+= \
+CPPSRCS	= \
 	nsDOMTimeEvent.cpp \
 	nsSMILAnimationController.cpp \
 	nsSMILAnimationFunction.cpp \
@@ -63,6 +70,7 @@ CPPSRCS		+= \
 	nsSMILFloatType.cpp \
 	nsSMILInstanceTime.cpp \
 	nsSMILInterval.cpp \
+	nsSMILKeySpline.cpp \
 	nsSMILMappedAttribute.cpp \
 	nsSMILNullType.cpp \
 	nsSMILParserUtils.cpp \
@@ -77,39 +85,22 @@ CPPSRCS		+= \
 	SMILEnumType.cpp \
 	SMILIntegerType.cpp \
 	SMILStringType.cpp \
-		$(NULL)
-endif
+	$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
-ifdef MOZ_SMIL
 ifdef ENABLE_TESTS
 TOOL_DIRS		+= test
 endif # ENABLE_TESTS
 
-EXPORTS		+= \
-	  nsISMILAnimationElement.h \
-	  nsISMILAttr.h \
-	  nsISMILType.h \
-	  nsSMILAnimationController.h \
-	  nsSMILCompositorTable.h \
-	  nsSMILCSSProperty.h \
-	  nsSMILKeySpline.h \
-	  nsSMILMappedAttribute.h \
-	  nsSMILMilestone.h \
-	  nsSMILTimeContainer.h \
-	  nsSMILTypes.h \
-	  $(NULL)
-
 INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		-I$(srcdir)/../events/src \
 		$(NULL)
-endif # MOZ_SMIL
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/content/smil/crashtests/699325-1.svg b/content/smil/crashtests/699325-1.svg
new file mode 100644
index 00000000000..7496c6ae213
--- /dev/null
+++ b/content/smil/crashtests/699325-1.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <rect fill="blue" height="100" width="100">
+    <animate id="a" attributeName="x"  calcMode="paced" values="50; 50; 50"/>
+  </rect>
+</svg>
diff --git a/content/smil/crashtests/crashtests.list b/content/smil/crashtests/crashtests.list
index d3e0f95ee2f..3289584e4a7 100644
--- a/content/smil/crashtests/crashtests.list
+++ b/content/smil/crashtests/crashtests.list
@@ -42,3 +42,4 @@ load 670313-1.svg
 load 678822-1.svg
 load 678847-1.svg
 load 678938-1.svg
+load 699325-1.svg
diff --git a/content/smil/nsSMILAnimationController.cpp b/content/smil/nsSMILAnimationController.cpp
index 678d3d1bcd8..3939b78b925 100644
--- a/content/smil/nsSMILAnimationController.cpp
+++ b/content/smil/nsSMILAnimationController.cpp
@@ -208,6 +208,7 @@ nsSMILAnimationController::RegisterAnimationElement(
                         "we shouldn't have deferred sampling if we already had "
                         "animations registered");
       StartSampling(GetRefreshDriver());
+      Sample(); // Run the first sample manually
     } // else, don't sample until a time container is registered (via AddChild)
   }
 }
@@ -817,8 +818,8 @@ nsSMILAnimationController::AddChild(nsSMILTimeContainer& aChild)
   NS_ENSURE_TRUE(key, NS_ERROR_OUT_OF_MEMORY);
 
   if (!mPauseState && mChildContainerTable.Count() == 1) {
-    Sample(); // Run the first sample manually
     MaybeStartSampling(GetRefreshDriver());
+    Sample(); // Run the first sample manually
   }
 
   return NS_OK;
diff --git a/content/smil/nsSMILAnimationFunction.cpp b/content/smil/nsSMILAnimationFunction.cpp
index 74184c5caab..416dbaa016d 100644
--- a/content/smil/nsSMILAnimationFunction.cpp
+++ b/content/smil/nsSMILAnimationFunction.cpp
@@ -561,6 +561,13 @@ nsSMILAnimationFunction::ComputePacedPosition(const nsSMILValueArray& aValues,
   if (totalDistance == COMPUTE_DISTANCE_ERROR)
     return NS_ERROR_FAILURE;
 
+  // If we have 0 total distance, then it's unclear where our "paced" position
+  // should be.  We can just fail, which drops us into discrete animation mode.
+  // (That's fine, since our values are apparently indistinguishable anyway.)
+  if (totalDistance == 0.0) {
+    return NS_ERROR_FAILURE;
+  }
+
   // total distance we should have moved at this point in time.
   // (called 'remainingDist' due to how it's used in loop below)
   double remainingDist = aSimpleProgress * totalDistance;
diff --git a/content/smil/test/Makefile.in b/content/smil/test/Makefile.in
index f0799d33129..a0a88f5a55e 100644
--- a/content/smil/test/Makefile.in
+++ b/content/smil/test/Makefile.in
@@ -69,6 +69,7 @@ _TEST_FILES = \
 	  test_smilCSSInherit.xhtml \
 	  test_smilCSSInvalidValues.xhtml \
 	  test_smilCSSPaced.xhtml \
+	  test_smilDynamicDelayedBeginElement.xhtml \
 	  test_smilMappedAttrFromTo.xhtml \
 	  test_smilMappedAttrFromBy.xhtml \
 	  test_smilMappedAttrPaced.xhtml \
diff --git a/content/smil/test/test_smilDynamicDelayedBeginElement.xhtml b/content/smil/test/test_smilDynamicDelayedBeginElement.xhtml
new file mode 100644
index 00000000000..c454d39f7cd
--- /dev/null
+++ b/content/smil/test/test_smilDynamicDelayedBeginElement.xhtml
@@ -0,0 +1,96 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=699143
+-->
+<head>
+  <title>Test for Bug 699143</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="smilTestUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=699143">Mozilla Bug 699143</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <svg xmlns="http://www.w3.org/2000/svg">
+    <rect id="r" height="500px" width="500px" fill="blue"/>
+  </svg>
+</div>
+<pre id="test">
+<script type="text/javascript">
+<![CDATA[
+
+/** Test for Bug 699143 **/
+SimpleTest.waitForExplicitFinish();
+
+// Values for 'width' attr on the <rect> above
+const INITIAL_VAL = "500px"
+const FROM_VAL = "20px";
+const TO_VAL   = "80px";
+
+// Helper function
+function createAnim() {
+  var a = document.createElementNS('http://www.w3.org/2000/svg', 'animate');
+  a.setAttribute('attributeName', 'width');
+  a.setAttribute('from', FROM_VAL);
+  a.setAttribute('to',   TO_VAL);
+  a.setAttribute('begin', 'indefinite');
+  a.setAttribute('dur', '3s');
+  a.setAttribute('fill', 'freeze');
+  return a;
+}
+
+// Main Functions
+function main() {
+  if (!SMILUtil.isSMILEnabled()) {
+    ok(false, "SMIL dosn't seem to be enabled");
+    SimpleTest.finish();
+    return;
+  }
+
+  // In unpatched Firefox builds, we'll only trigger Bug 699143 if we insert
+  // an animation and call beginElement() **after** the document start-time.
+  // Hence, we use executeSoon here to allow some time to pass.
+  SimpleTest.executeSoon(runTest);
+}
+
+function runTest() {
+  var svg = SMILUtil.getSVGRoot();
+
+  is(svg.getCurrentTime(), 0,
+     "even though we've allowed time to pass, we shouldn't have bothered " +
+     "updating the current time, since there aren't any animation elements");
+
+  // Insert an animation elem (should affect currentTime but not targeted attr)
+  var r = document.getElementById("r");
+  var a = createAnim();
+  r.appendChild(a);
+  isnot(svg.getCurrentTime(), 0,
+       "insertion of first animation element should have triggered a " +
+       "synchronous sample and updated our current time");
+  is(r.width.animVal.valueAsString, INITIAL_VAL,
+     "inserted animation shouldn't have affected its targeted attribute, " +
+     "since it doesn't have any intervals yet");
+
+  // Trigger the animation & be sure it takes effect
+  a.beginElement();
+  is(r.width.animVal.valueAsString, FROM_VAL,
+     "beginElement() should activate our animation & set its 'from' val");
+
+  // Rewind to time=0 & check target attr, to be sure beginElement()-generated
+  // interval starts later than that.
+  svg.setCurrentTime(0);
+  is(r.width.animVal.valueAsString, INITIAL_VAL,
+     "after rewinding to 0, our beginElement()-generated interval " +
+     "shouldn't be active yet");
+
+  SimpleTest.finish();
+}
+
+window.addEventListener("load", main, false);
+
+]]>
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/svg/content/src/DOMSVGLength.cpp b/content/svg/content/src/DOMSVGLength.cpp
index 1c1092ea58d..8e0de116e52 100644
--- a/content/svg/content/src/DOMSVGLength.cpp
+++ b/content/svg/content/src/DOMSVGLength.cpp
@@ -111,11 +111,9 @@ DOMSVGLength::DOMSVGLength()
 NS_IMETHODIMP
 DOMSVGLength::GetUnitType(PRUint16* aUnit)
 {
-#ifdef MOZ_SMIL
   if (mIsAnimValItem && HasOwner()) {
     Element()->FlushAnimations(); // May make HasOwner() == false
   }
-#endif
   *aUnit = HasOwner() ? InternalItem().GetUnit() : mUnit;
   return NS_OK;
 }
@@ -123,11 +121,9 @@ DOMSVGLength::GetUnitType(PRUint16* aUnit)
 NS_IMETHODIMP
 DOMSVGLength::GetValue(float* aValue)
 {
-#ifdef MOZ_SMIL
   if (mIsAnimValItem && HasOwner()) {
     Element()->FlushAnimations(); // May make HasOwner() == false
   }
-#endif
   if (HasOwner()) {
     *aValue = InternalItem().GetValueInUserUnits(Element(), Axis());
     if (NS_finite(*aValue)) {
@@ -162,11 +158,9 @@ DOMSVGLength::SetValue(float aUserUnitValue)
   if (HasOwner()) {
     if (InternalItem().SetFromUserUnitValue(aUserUnitValue, Element(), Axis())) {
       Element()->DidChangeLengthList(mAttrEnum, true);
-#ifdef MOZ_SMIL
       if (mList->mAList->IsAnimating()) {
         Element()->AnimationNeedsResample();
       }
-#endif
       return NS_OK;
     }
   } else if (mUnit == nsIDOMSVGLength::SVG_LENGTHTYPE_NUMBER ||
@@ -182,11 +176,9 @@ DOMSVGLength::SetValue(float aUserUnitValue)
 NS_IMETHODIMP
 DOMSVGLength::GetValueInSpecifiedUnits(float* aValue)
 {
-#ifdef MOZ_SMIL
   if (mIsAnimValItem && HasOwner()) {
     Element()->FlushAnimations(); // May make HasOwner() == false
   }
-#endif
   *aValue = HasOwner() ? InternalItem().GetValueInCurrentUnits() : mValue;
   return NS_OK;
 }
@@ -205,11 +197,9 @@ DOMSVGLength::SetValueInSpecifiedUnits(float aValue)
   if (HasOwner()) {
     InternalItem().SetValueInCurrentUnits(aValue);
     Element()->DidChangeLengthList(mAttrEnum, true);
-#ifdef MOZ_SMIL
     if (mList->mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
     return NS_OK;
   }
   mValue = aValue;
@@ -230,11 +220,9 @@ DOMSVGLength::SetValueAsString(const nsAString& aValue)
   if (HasOwner()) {
     InternalItem() = value;
     Element()->DidChangeLengthList(mAttrEnum, true);
-#ifdef MOZ_SMIL
     if (mList->mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
     return NS_OK;
   }
   mValue = value.GetValueInCurrentUnits();
@@ -245,11 +233,9 @@ DOMSVGLength::SetValueAsString(const nsAString& aValue)
 NS_IMETHODIMP
 DOMSVGLength::GetValueAsString(nsAString& aValue)
 {
-#ifdef MOZ_SMIL
   if (mIsAnimValItem && HasOwner()) {
     Element()->FlushAnimations(); // May make HasOwner() == false
   }
-#endif
   if (HasOwner()) {
     InternalItem().GetValueAsString(aValue);
     return NS_OK;
@@ -275,11 +261,9 @@ DOMSVGLength::NewValueSpecifiedUnits(PRUint16 aUnit, float aValue)
   if (HasOwner()) {
     InternalItem().SetValueAndUnit(aValue, PRUint8(aUnit));
     Element()->DidChangeLengthList(mAttrEnum, true);
-#ifdef MOZ_SMIL
     if (mList->mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
     return NS_OK;
   }
   mUnit = PRUint8(aUnit);
diff --git a/content/svg/content/src/DOMSVGLengthList.cpp b/content/svg/content/src/DOMSVGLengthList.cpp
index 883bea78581..0fa07eba22b 100644
--- a/content/svg/content/src/DOMSVGLengthList.cpp
+++ b/content/svg/content/src/DOMSVGLengthList.cpp
@@ -95,11 +95,9 @@ NS_INTERFACE_MAP_END
 nsIDOMSVGLength*
 DOMSVGLengthList::GetItemWithoutAddRef(PRUint32 aIndex)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   if (aIndex < Length()) {
     EnsureItemAt(aIndex);
     return mItems[aIndex];
@@ -158,11 +156,9 @@ DOMSVGLengthList::InternalList()
 NS_IMETHODIMP
 DOMSVGLengthList::GetNumberOfItems(PRUint32 *aNumberOfItems)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   *aNumberOfItems = Length();
   return NS_OK;
 }
@@ -183,11 +179,9 @@ DOMSVGLengthList::Clear()
     mItems.Clear();
     InternalList().Clear();
     Element()->DidChangeLengthList(AttrEnum(), true);
-#ifdef MOZ_SMIL
     if (mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
   }
   return NS_OK;
 }
@@ -276,11 +270,9 @@ DOMSVGLengthList::InsertItemBefore(nsIDOMSVGLength *newItem,
   UpdateListIndicesFromIndex(mItems, index + 1);
 
   Element()->DidChangeLengthList(AttrEnum(), true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   *_retval = domItem.forget().get();
   return NS_OK;
 }
@@ -320,11 +312,9 @@ DOMSVGLengthList::ReplaceItem(nsIDOMSVGLength *newItem,
   domItem->InsertingIntoList(this, AttrEnum(), index, IsAnimValList());
 
   Element()->DidChangeLengthList(AttrEnum(), true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   NS_ADDREF(*_retval = domItem.get());
   return NS_OK;
 }
@@ -361,11 +351,9 @@ DOMSVGLengthList::RemoveItem(PRUint32 index,
   UpdateListIndicesFromIndex(mItems, index);
 
   Element()->DidChangeLengthList(AttrEnum(), true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   return NS_OK;
 }
 
diff --git a/content/svg/content/src/DOMSVGNumber.cpp b/content/svg/content/src/DOMSVGNumber.cpp
index 25c8d6f3a24..2648f32b1d4 100644
--- a/content/svg/content/src/DOMSVGNumber.cpp
+++ b/content/svg/content/src/DOMSVGNumber.cpp
@@ -106,11 +106,9 @@ DOMSVGNumber::DOMSVGNumber()
 NS_IMETHODIMP
 DOMSVGNumber::GetValue(float* aValue)
 {
-#ifdef MOZ_SMIL
   if (mIsAnimValItem && HasOwner()) {
     Element()->FlushAnimations(); // May make HasOwner() == false
   }
-#endif
   *aValue = HasOwner() ? InternalItem() : mValue;
   return NS_OK;
 }
@@ -127,11 +125,9 @@ DOMSVGNumber::SetValue(float aValue)
   if (HasOwner()) {
     InternalItem() = aValue;
     Element()->DidChangeNumberList(mAttrEnum, true);
-#ifdef MOZ_SMIL
     if (mList->mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
     return NS_OK;
   }
   mValue = aValue;
diff --git a/content/svg/content/src/DOMSVGNumberList.cpp b/content/svg/content/src/DOMSVGNumberList.cpp
index 9abfb1d59c3..ca3a73c90e2 100644
--- a/content/svg/content/src/DOMSVGNumberList.cpp
+++ b/content/svg/content/src/DOMSVGNumberList.cpp
@@ -95,11 +95,9 @@ NS_INTERFACE_MAP_END
 nsIDOMSVGNumber*
 DOMSVGNumberList::GetItemWithoutAddRef(PRUint32 aIndex)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   if (aIndex < Length()) {
     EnsureItemAt(aIndex);
     return mItems[aIndex];
@@ -158,11 +156,9 @@ DOMSVGNumberList::InternalList()
 NS_IMETHODIMP
 DOMSVGNumberList::GetNumberOfItems(PRUint32 *aNumberOfItems)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   *aNumberOfItems = Length();
   return NS_OK;
 }
@@ -183,11 +179,9 @@ DOMSVGNumberList::Clear()
     mItems.Clear();
     InternalList().Clear();
     Element()->DidChangeNumberList(AttrEnum(), true);
-#ifdef MOZ_SMIL
     if (mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
   }
   return NS_OK;
 }
@@ -276,11 +270,9 @@ DOMSVGNumberList::InsertItemBefore(nsIDOMSVGNumber *newItem,
   UpdateListIndicesFromIndex(mItems, index + 1);
 
   Element()->DidChangeNumberList(AttrEnum(), true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   *_retval = domItem.forget().get();
   return NS_OK;
 }
@@ -320,11 +312,9 @@ DOMSVGNumberList::ReplaceItem(nsIDOMSVGNumber *newItem,
   domItem->InsertingIntoList(this, AttrEnum(), index, IsAnimValList());
 
   Element()->DidChangeNumberList(AttrEnum(), true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   NS_ADDREF(*_retval = domItem.get());
   return NS_OK;
 }
@@ -361,11 +351,9 @@ DOMSVGNumberList::RemoveItem(PRUint32 index,
   UpdateListIndicesFromIndex(mItems, index);
 
   Element()->DidChangeNumberList(AttrEnum(), true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   return NS_OK;
 }
 
diff --git a/content/svg/content/src/DOMSVGPathSegList.cpp b/content/svg/content/src/DOMSVGPathSegList.cpp
index a38c99264c0..f8aa5f14db6 100644
--- a/content/svg/content/src/DOMSVGPathSegList.cpp
+++ b/content/svg/content/src/DOMSVGPathSegList.cpp
@@ -99,11 +99,9 @@ DOMSVGPathSegList::~DOMSVGPathSegList()
 nsIDOMSVGPathSeg*
 DOMSVGPathSegList::GetItemWithoutAddRef(PRUint32 aIndex)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   if (aIndex < Length()) {
     EnsureItemAt(aIndex);
     return ItemAt(aIndex);
@@ -255,11 +253,9 @@ DOMSVGPathSegList::InternalAList()
 NS_IMETHODIMP
 DOMSVGPathSegList::GetNumberOfItems(PRUint32 *aNumberOfItems)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   *aNumberOfItems = Length();
   return NS_OK;
 }
@@ -289,11 +285,9 @@ DOMSVGPathSegList::Clear()
 
     InternalList().Clear();
     Element()->DidChangePathSegList(true);
-#ifdef MOZ_SMIL
     if (AttrIsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
   }
   return NS_OK;
 }
@@ -393,11 +387,9 @@ DOMSVGPathSegList::InsertItemBefore(nsIDOMSVGPathSeg *aNewItem,
   UpdateListIndicesFromIndex(aIndex + 1, argCount + 1);
 
   Element()->DidChangePathSegList(true);
-#ifdef MOZ_SMIL
   if (AttrIsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   *_retval = domItem.forget().get();
   return NS_OK;
 }
@@ -459,11 +451,9 @@ DOMSVGPathSegList::ReplaceItem(nsIDOMSVGPathSeg *aNewItem,
   }
 
   Element()->DidChangePathSegList(true);
-#ifdef MOZ_SMIL
   if (AttrIsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   NS_ADDREF(*_retval = domItem.get());
   return NS_OK;
 }
@@ -503,11 +493,9 @@ DOMSVGPathSegList::RemoveItem(PRUint32 aIndex,
   UpdateListIndicesFromIndex(aIndex, -(argCount + 1));
 
   Element()->DidChangePathSegList(true);
-#ifdef MOZ_SMIL
   if (AttrIsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   return NS_OK;
 }
 
diff --git a/content/svg/content/src/DOMSVGPoint.cpp b/content/svg/content/src/DOMSVGPoint.cpp
index 3f783016902..ba3d6ef946b 100644
--- a/content/svg/content/src/DOMSVGPoint.cpp
+++ b/content/svg/content/src/DOMSVGPoint.cpp
@@ -81,11 +81,9 @@ NS_INTERFACE_MAP_END
 NS_IMETHODIMP
 DOMSVGPoint::GetX(float* aX)
 {
-#ifdef MOZ_SMIL
   if (mIsAnimValItem && HasOwner()) {
     Element()->FlushAnimations(); // May make HasOwner() == false
   }
-#endif
   *aX = HasOwner() ? InternalItem().mX : mPt.mX;
   return NS_OK;
 }
@@ -102,11 +100,9 @@ DOMSVGPoint::SetX(float aX)
   if (HasOwner()) {
     InternalItem().mX = aX;
     Element()->DidChangePointList(true);
-#ifdef MOZ_SMIL
     if (mList->AttrIsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
     return NS_OK;
   }
   mPt.mX = aX;
@@ -116,11 +112,9 @@ DOMSVGPoint::SetX(float aX)
 NS_IMETHODIMP
 DOMSVGPoint::GetY(float* aY)
 {
-#ifdef MOZ_SMIL
   if (mIsAnimValItem && HasOwner()) {
     Element()->FlushAnimations(); // May make HasOwner() == false
   }
-#endif
   *aY = HasOwner() ? InternalItem().mY : mPt.mY;
   return NS_OK;
 }
@@ -137,11 +131,9 @@ DOMSVGPoint::SetY(float aY)
   if (HasOwner()) {
     InternalItem().mY = aY;
     Element()->DidChangePointList(true);
-#ifdef MOZ_SMIL
     if (mList->AttrIsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
     return NS_OK;
   }
   mPt.mY = aY;
diff --git a/content/svg/content/src/DOMSVGPointList.cpp b/content/svg/content/src/DOMSVGPointList.cpp
index 3b8b569aab9..d4b139ae867 100644
--- a/content/svg/content/src/DOMSVGPointList.cpp
+++ b/content/svg/content/src/DOMSVGPointList.cpp
@@ -119,11 +119,9 @@ DOMSVGPointList::~DOMSVGPointList()
 nsIDOMSVGPoint*
 DOMSVGPointList::GetItemWithoutAddRef(PRUint32 aIndex)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   if (aIndex < Length()) {
     EnsureItemAt(aIndex);
     return mItems[aIndex];
@@ -200,11 +198,9 @@ DOMSVGPointList::InternalAList()
 NS_IMETHODIMP
 DOMSVGPointList::GetNumberOfItems(PRUint32 *aNumberOfItems)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   *aNumberOfItems = Length();
   return NS_OK;
 }
@@ -234,11 +230,9 @@ DOMSVGPointList::Clear()
 
     InternalList().Clear();
     Element()->DidChangePointList(true);
-#ifdef MOZ_SMIL
     if (AttrIsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
   }
   return NS_OK;
 }
@@ -327,11 +321,9 @@ DOMSVGPointList::InsertItemBefore(nsIDOMSVGPoint *aNewItem,
   UpdateListIndicesFromIndex(mItems, aIndex + 1);
 
   Element()->DidChangePointList(true);
-#ifdef MOZ_SMIL
   if (AttrIsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   *_retval = domItem.forget().get();
   return NS_OK;
 }
@@ -371,11 +363,9 @@ DOMSVGPointList::ReplaceItem(nsIDOMSVGPoint *aNewItem,
   domItem->InsertingIntoList(this, aIndex, IsAnimValList());
 
   Element()->DidChangePointList(true);
-#ifdef MOZ_SMIL
   if (AttrIsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   NS_ADDREF(*_retval = domItem.get());
   return NS_OK;
 }
@@ -412,11 +402,9 @@ DOMSVGPointList::RemoveItem(PRUint32 aIndex,
   UpdateListIndicesFromIndex(mItems, aIndex);
 
   Element()->DidChangePointList(true);
-#ifdef MOZ_SMIL
   if (AttrIsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   return NS_OK;
 }
 
diff --git a/content/svg/content/src/DOMSVGTransform.cpp b/content/svg/content/src/DOMSVGTransform.cpp
index 67c85001c59..94d36007c25 100644
--- a/content/svg/content/src/DOMSVGTransform.cpp
+++ b/content/svg/content/src/DOMSVGTransform.cpp
@@ -345,11 +345,9 @@ DOMSVGTransform::NotifyElementOfChange()
 {
   if (HasOwner()) {
     Element()->DidChangeTransformList(true);
-#ifdef MOZ_SMIL
     if (mList->mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif // MOZ_SMIL
   }
 }
 
diff --git a/content/svg/content/src/DOMSVGTransformList.cpp b/content/svg/content/src/DOMSVGTransformList.cpp
index c47a6a7f7f6..b95a0f277ab 100644
--- a/content/svg/content/src/DOMSVGTransformList.cpp
+++ b/content/svg/content/src/DOMSVGTransformList.cpp
@@ -97,11 +97,9 @@ NS_INTERFACE_MAP_END
 nsIDOMSVGTransform*
 DOMSVGTransformList::GetItemWithoutAddRef(PRUint32 aIndex)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   if (aIndex < Length()) {
     EnsureItemAt(aIndex);
     return mItems[aIndex];
@@ -163,11 +161,9 @@ DOMSVGTransformList::InternalList()
 NS_IMETHODIMP
 DOMSVGTransformList::GetNumberOfItems(PRUint32 *aNumberOfItems)
 {
-#ifdef MOZ_SMIL
   if (IsAnimValList()) {
     Element()->FlushAnimations();
   }
-#endif
   *aNumberOfItems = Length();
   return NS_OK;
 }
@@ -196,11 +192,9 @@ DOMSVGTransformList::Clear()
     mItems.Clear();
     InternalList().Clear();
     Element()->DidChangeTransformList(true);
-#ifdef MOZ_SMIL
     if (mAList->IsAnimating()) {
       Element()->AnimationNeedsResample();
     }
-#endif
   }
   return NS_OK;
 }
@@ -292,11 +286,9 @@ DOMSVGTransformList::InsertItemBefore(nsIDOMSVGTransform *newItem,
   UpdateListIndicesFromIndex(mItems, index + 1);
 
   Element()->DidChangeTransformList(true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   *_retval = domItem.forget().get();
   return NS_OK;
 }
@@ -338,11 +330,9 @@ DOMSVGTransformList::ReplaceItem(nsIDOMSVGTransform *newItem,
   domItem->InsertingIntoList(this, index, IsAnimValList());
 
   Element()->DidChangeTransformList(true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   NS_ADDREF(*_retval = domItem.get());
   return NS_OK;
 }
@@ -379,11 +369,9 @@ DOMSVGTransformList::RemoveItem(PRUint32 index, nsIDOMSVGTransform **_retval)
   UpdateListIndicesFromIndex(mItems, index);
 
   Element()->DidChangeTransformList(true);
-#ifdef MOZ_SMIL
   if (mAList->IsAnimating()) {
     Element()->AnimationNeedsResample();
   }
-#endif
   return NS_OK;
 }
 
diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in
index e65ecaee909..57d5902e1e7 100644
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -136,31 +136,27 @@ CPPSRCS		= \
 		SVGTransform.cpp \
 		SVGTransformList.cpp \
 		SVGTransformListParser.cpp \
+		nsSVGAnimateElement.cpp \
+		nsSVGAnimateTransformElement.cpp \
+		nsSVGAnimateMotionElement.cpp \
+		nsSVGAnimationElement.cpp \
+		nsSVGMpathElement.cpp \
+		nsSVGSetElement.cpp \
+		SVGIntegerPairSMILType.cpp \
+		SVGLengthListSMILType.cpp \
+		SVGMotionSMILType.cpp \
+		SVGMotionSMILAttr.cpp \
+		SVGMotionSMILAnimationFunction.cpp \
+		SVGMotionSMILPathUtils.cpp \
+		SVGNumberListSMILType.cpp \
+		SVGNumberPairSMILType.cpp \
+		SVGOrientSMILType.cpp \
+		SVGPathSegListSMILType.cpp \
+		SVGPointListSMILType.cpp \
+		SVGTransformListSMILType.cpp \
+		SVGViewBoxSMILType.cpp \
 		$(NULL)
 
-ifdef MOZ_SMIL
-CPPSRCS += nsSVGAnimateElement.cpp \
-           nsSVGAnimateTransformElement.cpp \
-           nsSVGAnimateMotionElement.cpp \
-           nsSVGAnimationElement.cpp \
-           nsSVGMpathElement.cpp \
-           nsSVGSetElement.cpp \
-           SVGIntegerPairSMILType.cpp \
-           SVGLengthListSMILType.cpp \
-           SVGMotionSMILType.cpp \
-           SVGMotionSMILAttr.cpp \
-           SVGMotionSMILAnimationFunction.cpp \
-           SVGMotionSMILPathUtils.cpp \
-           SVGNumberListSMILType.cpp \
-           SVGNumberPairSMILType.cpp \
-           SVGOrientSMILType.cpp \
-           SVGPathSegListSMILType.cpp \
-           SVGPointListSMILType.cpp \
-           SVGTransformListSMILType.cpp \
-           SVGViewBoxSMILType.cpp \
-           $(NULL)
-endif
-
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
@@ -186,12 +182,7 @@ INCLUDES += 	\
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../../html/content/src \
 		-I$(topsrcdir)/content/xbl/src \
-		$(NULL)
-
-ifdef MOZ_SMIL
-INCLUDES += 	\
 		-I$(srcdir)/../../../smil \
 		$(NULL)
-endif
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/svg/content/src/SVGAnimatedLengthList.cpp b/content/svg/content/src/SVGAnimatedLengthList.cpp
index 4027a4d509c..717efceadf4 100644
--- a/content/svg/content/src/SVGAnimatedLengthList.cpp
+++ b/content/svg/content/src/SVGAnimatedLengthList.cpp
@@ -38,10 +38,8 @@
 #include "DOMSVGAnimatedLengthList.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGLengthListSMILType.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -149,7 +147,6 @@ SVGAnimatedLengthList::ClearAnimValue(nsSVGElement *aElement,
   aElement->DidAnimateLengthList(aAttrEnum);
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 SVGAnimatedLengthList::ToSMILAttr(nsSVGElement *aSVGElement,
                                   PRUint8 aAttrEnum,
@@ -239,6 +236,5 @@ SVGAnimatedLengthList::SMILAnimatedLengthList::ClearAnimValue()
     mVal->ClearAnimValue(mElement, mAttrEnum);
   }
 }
-#endif // MOZ_SMIL
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedLengthList.h b/content/svg/content/src/SVGAnimatedLengthList.h
index 566177a75f4..7d1121adfa8 100644
--- a/content/svg/content/src/SVGAnimatedLengthList.h
+++ b/content/svg/content/src/SVGAnimatedLengthList.h
@@ -41,9 +41,7 @@
 
 class nsSVGElement;
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -100,11 +98,9 @@ public:
     return !!mAnimVal;
   }
 
-#ifdef MOZ_SMIL
   /// Callers own the returned nsISMILAttr
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement, PRUint8 aAttrEnum,
                           PRUint8 aAxis, bool aCanZeroPadList);
-#endif // MOZ_SMIL
 
 private:
 
@@ -116,7 +112,6 @@ private:
   SVGLengthList mBaseVal;
   nsAutoPtr<SVGLengthList> mAnimVal;
 
-#ifdef MOZ_SMIL
   struct SMILAnimatedLengthList : public nsISMILAttr
   {
   public:
@@ -150,7 +145,6 @@ private:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedNumberList.cpp b/content/svg/content/src/SVGAnimatedNumberList.cpp
index 23fcc09694d..7148c31402b 100644
--- a/content/svg/content/src/SVGAnimatedNumberList.cpp
+++ b/content/svg/content/src/SVGAnimatedNumberList.cpp
@@ -38,10 +38,8 @@
 #include "DOMSVGAnimatedNumberList.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGNumberListSMILType.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -151,7 +149,6 @@ SVGAnimatedNumberList::ClearAnimValue(nsSVGElement *aElement,
   aElement->DidAnimateNumberList(aAttrEnum);
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 SVGAnimatedNumberList::ToSMILAttr(nsSVGElement *aSVGElement,
                                   PRUint8 aAttrEnum)
@@ -215,6 +212,5 @@ SVGAnimatedNumberList::SMILAnimatedNumberList::ClearAnimValue()
     mVal->ClearAnimValue(mElement, mAttrEnum);
   }
 }
-#endif // MOZ_SMIL
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedNumberList.h b/content/svg/content/src/SVGAnimatedNumberList.h
index e807e703421..5ddbb148366 100644
--- a/content/svg/content/src/SVGAnimatedNumberList.h
+++ b/content/svg/content/src/SVGAnimatedNumberList.h
@@ -41,9 +41,7 @@
 
 class nsSVGElement;
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -108,10 +106,8 @@ public:
     return !!mAnimVal;
   }
 
-#ifdef MOZ_SMIL
   /// Callers own the returned nsISMILAttr
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement, PRUint8 aAttrEnum);
-#endif // MOZ_SMIL
 
 private:
 
@@ -124,7 +120,6 @@ private:
   nsAutoPtr<SVGNumberList> mAnimVal;
   bool mIsBaseSet;
 
-#ifdef MOZ_SMIL
   struct SMILAnimatedNumberList : public nsISMILAttr
   {
   public:
@@ -152,7 +147,6 @@ private:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedPathSegList.cpp b/content/svg/content/src/SVGAnimatedPathSegList.cpp
index a5956d91cb5..85db998e8a8 100644
--- a/content/svg/content/src/SVGAnimatedPathSegList.cpp
+++ b/content/svg/content/src/SVGAnimatedPathSegList.cpp
@@ -38,10 +38,8 @@
 #include "DOMSVGPathSegList.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGPathSegListSMILType.h"
-#endif // MOZ_SMIL
 
 // See the comments in this file's header!
 
@@ -174,7 +172,6 @@ SVGAnimatedPathSegList::ClearAnimValue(nsSVGElement *aElement)
   aElement->DidAnimatePathSegList();
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 SVGAnimatedPathSegList::ToSMILAttr(nsSVGElement *aElement)
 {
@@ -236,6 +233,5 @@ SVGAnimatedPathSegList::SMILAnimatedPathSegList::ClearAnimValue()
     mVal->ClearAnimValue(mElement);
   }
 }
-#endif // MOZ_SMIL
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedPathSegList.h b/content/svg/content/src/SVGAnimatedPathSegList.h
index 924518ebbca..8c514a714d3 100644
--- a/content/svg/content/src/SVGAnimatedPathSegList.h
+++ b/content/svg/content/src/SVGAnimatedPathSegList.h
@@ -41,9 +41,7 @@
 
 class nsSVGElement;
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -112,10 +110,8 @@ public:
     return !!mAnimVal;
   }
 
-#ifdef MOZ_SMIL
   /// Callers own the returned nsISMILAttr
   nsISMILAttr* ToSMILAttr(nsSVGElement* aElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -127,7 +123,6 @@ private:
   SVGPathData mBaseVal;
   nsAutoPtr<SVGPathData> mAnimVal;
 
-#ifdef MOZ_SMIL
   struct SMILAnimatedPathSegList : public nsISMILAttr
   {
   public:
@@ -152,7 +147,6 @@ private:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedPointList.cpp b/content/svg/content/src/SVGAnimatedPointList.cpp
index 3012610891c..ece9f62f260 100644
--- a/content/svg/content/src/SVGAnimatedPointList.cpp
+++ b/content/svg/content/src/SVGAnimatedPointList.cpp
@@ -38,10 +38,8 @@
 #include "DOMSVGPointList.h"
 #include "nsSVGElement.h"
 #include "nsSVGAttrTearoffTable.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGPointListSMILType.h"
-#endif // MOZ_SMIL
 
 // See the comments in this file's header!
 
@@ -177,7 +175,6 @@ SVGAnimatedPointList::ClearAnimValue(nsSVGElement *aElement)
   aElement->DidAnimatePointList();
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 SVGAnimatedPointList::ToSMILAttr(nsSVGElement *aElement)
 {
@@ -239,6 +236,5 @@ SVGAnimatedPointList::SMILAnimatedPointList::ClearAnimValue()
     mVal->ClearAnimValue(mElement);
   }
 }
-#endif // MOZ_SMIL
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedPointList.h b/content/svg/content/src/SVGAnimatedPointList.h
index c5c6e24f77e..2589547b294 100644
--- a/content/svg/content/src/SVGAnimatedPointList.h
+++ b/content/svg/content/src/SVGAnimatedPointList.h
@@ -41,9 +41,7 @@
 
 class nsSVGElement;
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -112,10 +110,8 @@ public:
     return !!mAnimVal;
   }
 
-#ifdef MOZ_SMIL
   /// Callers own the returned nsISMILAttr
   nsISMILAttr* ToSMILAttr(nsSVGElement* aElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -127,7 +123,6 @@ private:
   SVGPointList mBaseVal;
   nsAutoPtr<SVGPointList> mAnimVal;
 
-#ifdef MOZ_SMIL
   struct SMILAnimatedPointList : public nsISMILAttr
   {
   public:
@@ -152,7 +147,6 @@ private:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
index bdc189529b7..9905e3a4831 100644
--- a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
+++ b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
@@ -40,10 +40,8 @@
 
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "nsWhitespaceTokenizer.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SMILEnumType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -241,11 +239,9 @@ SVGAnimatedPreserveAspectRatio::SetBaseValueString(
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   // We don't need to call DidChange* here - we're only called by
   // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
@@ -286,11 +282,9 @@ SVGAnimatedPreserveAspectRatio::SetBaseAlign(PRUint16 aAlign,
 
   mAnimVal.mAlign = mBaseVal.mAlign;
   aSVGElement->DidChangePreserveAspectRatio(true);
-#ifdef MOZ_SMIL
   if (mIsAnimated) {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   
   return NS_OK;
 }
@@ -305,11 +299,9 @@ SVGAnimatedPreserveAspectRatio::SetBaseMeetOrSlice(PRUint16 aMeetOrSlice,
 
   mAnimVal.mMeetOrSlice = mBaseVal.mMeetOrSlice;
   aSVGElement->DidChangePreserveAspectRatio(true);
-#ifdef MOZ_SMIL
   if (mIsAnimated) {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   
   return NS_OK;
 }
@@ -338,7 +330,6 @@ SVGAnimatedPreserveAspectRatio::ToDOMAnimatedPreserveAspectRatio(
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 SVGAnimatedPreserveAspectRatio::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -406,4 +397,3 @@ SMILPreserveAspectRatio::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
index e58b56d8c03..995cc67e60c 100644
--- a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
+++ b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
@@ -129,10 +129,8 @@ public:
   nsresult ToDOMAnimatedPreserveAspectRatio(
     nsIDOMSVGAnimatedPreserveAspectRatio **aResult,
     nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -184,9 +182,7 @@ public:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetAlign(PRUint16* aAlign)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aAlign = mVal->GetAnimValue().GetAlign();
       return NS_OK;
     }
@@ -195,9 +191,7 @@ public:
 
     NS_IMETHOD GetMeetOrSlice(PRUint16* aMeetOrSlice)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aMeetOrSlice = mVal->GetAnimValue().GetMeetOrSlice();
       return NS_OK;
     }
@@ -226,7 +220,6 @@ public:
       { return mVal->ToDOMAnimVal(aAnimVal, mSVGElement); }
   };
 
-#ifdef MOZ_SMIL
   struct SMILPreserveAspectRatio : public nsISMILAttr
   {
   public:
@@ -249,7 +242,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedTransformList.cpp b/content/svg/content/src/SVGAnimatedTransformList.cpp
index a8c276c21a7..7d8a1b3f604 100644
--- a/content/svg/content/src/SVGAnimatedTransformList.cpp
+++ b/content/svg/content/src/SVGAnimatedTransformList.cpp
@@ -37,13 +37,11 @@
 #include "SVGAnimatedTransformList.h"
 #include "DOMSVGAnimatedTransformList.h"
 
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGTransform.h"
 #include "SVGTransformListSMILType.h"
 #include "nsSVGUtils.h"
 #include "prdtoa.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -169,7 +167,6 @@ SVGAnimatedTransformList::IsExplicitlySet() const
   return mIsAttrSet || !mBaseVal.IsEmpty() || mAnimVal;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 SVGAnimatedTransformList::ToSMILAttr(nsSVGElement* aSVGElement)
 {
@@ -350,6 +347,4 @@ SVGAnimatedTransformList::SMILAnimatedTransformList::ClearAnimValue()
   }
 }
 
-#endif // MOZ_SMIL
-
 } // namespace mozilla
diff --git a/content/svg/content/src/SVGAnimatedTransformList.h b/content/svg/content/src/SVGAnimatedTransformList.h
index 98961299efd..576e1b481a6 100644
--- a/content/svg/content/src/SVGAnimatedTransformList.h
+++ b/content/svg/content/src/SVGAnimatedTransformList.h
@@ -43,9 +43,7 @@
 
 class nsSVGElement;
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 namespace mozilla {
 
@@ -102,10 +100,8 @@ public:
     return !!mAnimVal;
   }
 
-#ifdef MOZ_SMIL
   /// Callers own the returned nsISMILAttr
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -118,7 +114,6 @@ private:
   nsAutoPtr<SVGTransformList> mAnimVal;
   bool mIsAttrSet;
 
-#ifdef MOZ_SMIL
   struct SMILAnimatedTransformList : public nsISMILAttr
   {
   public:
@@ -150,7 +145,6 @@ private:
     SVGAnimatedTransformList* mVal;
     nsSVGElement* mElement;
   };
-#endif // MOZ_SMIL
 };
 
 } // namespace mozilla
diff --git a/content/svg/content/src/nsSVGAngle.cpp b/content/svg/content/src/nsSVGAngle.cpp
index 2f9e0167da8..087d00f2ee8 100644
--- a/content/svg/content/src/nsSVGAngle.cpp
+++ b/content/svg/content/src/nsSVGAngle.cpp
@@ -43,10 +43,8 @@
 #include "nsSVGMarkerElement.h"
 #include "nsMathUtils.h"
 #include "nsContentUtils.h" // NS_ENSURE_FINITE
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGOrientSMILType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -264,11 +262,9 @@ nsSVGAngle::SetBaseValueInSpecifiedUnits(float aValue,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeAngle(mAttrEnum, true);
 }
 
@@ -301,11 +297,9 @@ nsSVGAngle::NewValueSpecifiedUnits(PRUint16 unitType,
     mAnimVal = mBaseVal;
     mAnimValUnit = mBaseValUnit;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   if (aSVGElement) {
     aSVGElement->DidChangeAngle(mAttrEnum, true);
   }
@@ -355,11 +349,9 @@ nsSVGAngle::SetBaseValueString(const nsAString &aValueAsString,
     mAnimVal = mBaseVal;
     mAnimValUnit = mBaseValUnit;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   // We don't need to call DidChange* here - we're only called by
   // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
@@ -386,11 +378,9 @@ nsSVGAngle::SetBaseValue(float aValue, nsSVGElement *aSVGElement)
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   if (aSVGElement) {
     aSVGElement->DidChangeAngle(mAttrEnum, true);
   }
@@ -428,7 +418,6 @@ NS_NewDOMSVGAngle(nsIDOMSVGAngle** aResult)
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGAngle::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -504,4 +493,3 @@ nsSVGAngle::SMILOrient::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGAngle.h b/content/svg/content/src/nsSVGAngle.h
index fe63a52d321..4c51f8877ae 100644
--- a/content/svg/content/src/nsSVGAngle.h
+++ b/content/svg/content/src/nsSVGAngle.h
@@ -80,10 +80,8 @@ public:
   static nsresult ToDOMSVGAngle(nsIDOMSVGAngle **aResult);
   nsresult ToDOMAnimatedAngle(nsIDOMSVGAnimatedAngle **aResult,
                               nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
   static float GetDegreesPerUnit(PRUint8 aUnit);
 
@@ -198,7 +196,6 @@ public:
       { return mVal->ToDOMAnimVal(aAnimVal, mSVGElement); }
   };
 
-#ifdef MOZ_SMIL
   // We do not currently implemente a SMILAngle struct because in SVG 1.1 the
   // only *animatable* attribute that takes an <angle> is 'orient', on the
   // 'marker' element, and 'orient' must be special cased since it can also
@@ -231,7 +228,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 nsresult
diff --git a/content/svg/content/src/nsSVGBoolean.cpp b/content/svg/content/src/nsSVGBoolean.cpp
index 7a7596c7ff1..2b7db25d221 100644
--- a/content/svg/content/src/nsSVGBoolean.cpp
+++ b/content/svg/content/src/nsSVGBoolean.cpp
@@ -35,10 +35,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsSVGBoolean.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SMILBoolType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -87,11 +85,9 @@ nsSVGBoolean::SetBaseValueString(const nsAString &aValueAsString,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   // We don't need to call DidChange* here - we're only called by
   // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
@@ -118,11 +114,9 @@ nsSVGBoolean::SetBaseValue(bool aValue,
     if (!mIsAnimated) {
       mAnimVal = mBaseVal;
     }
-#ifdef MOZ_SMIL
     else {
       aSVGElement->AnimationNeedsResample();
     }
-#endif
     aSVGElement->DidChangeBoolean(mAttrEnum, true);
   }
 }
@@ -147,7 +141,6 @@ nsSVGBoolean::ToDOMAnimatedBoolean(nsIDOMSVGAnimatedBoolean **aResult,
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGBoolean::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -201,4 +194,3 @@ nsSVGBoolean::SMILBool::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGBoolean.h b/content/svg/content/src/nsSVGBoolean.h
index 44933f4dd73..79428b748dd 100644
--- a/content/svg/content/src/nsSVGBoolean.h
+++ b/content/svg/content/src/nsSVGBoolean.h
@@ -65,10 +65,8 @@ public:
 
   nsresult ToDOMAnimatedBoolean(nsIDOMSVGAnimatedBoolean **aResult,
                                 nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -98,15 +96,12 @@ public:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetAnimVal(bool* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->GetAnimValue();
       return NS_OK;
     }
   };
 
-#ifdef MOZ_SMIL
   struct SMILBool : public nsISMILAttr
   {
   public:
@@ -128,6 +123,5 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 #endif //__NS_SVGBOOLEAN_H__
diff --git a/content/svg/content/src/nsSVGClass.cpp b/content/svg/content/src/nsSVGClass.cpp
index f8a4b5078bb..db5597a43e3 100644
--- a/content/svg/content/src/nsSVGClass.cpp
+++ b/content/svg/content/src/nsSVGClass.cpp
@@ -36,10 +36,8 @@
 
 #include "nsSVGClass.h"
 #include "nsSVGStylableElement.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SMILStringType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -69,11 +67,9 @@ nsSVGClass::SetBaseValue(const nsAString& aValue,
   if (aDoSetAttr) {
     aSVGElement->SetAttr(kNameSpaceID_None, nsGkAtoms::_class, aValue, true);
   }
-#ifdef MOZ_SMIL
   if (mAnimVal) {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 }
 
 void
@@ -116,14 +112,11 @@ nsSVGClass::ToDOMAnimatedString(nsIDOMSVGAnimatedString **aResult,
 NS_IMETHODIMP
 nsSVGClass::DOMAnimatedString::GetAnimVal(nsAString& aResult)
 { 
-#ifdef MOZ_SMIL
   mSVGElement->FlushAnimations();
-#endif
   mVal->GetAnimValue(aResult, mSVGElement);
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGClass::ToSMILAttr(nsSVGStylableElement *aSVGElement)
 {
@@ -172,4 +165,3 @@ nsSVGClass::SMILString::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGClass.h b/content/svg/content/src/nsSVGClass.h
index 154075d6de3..4b414f16dc3 100644
--- a/content/svg/content/src/nsSVGClass.h
+++ b/content/svg/content/src/nsSVGClass.h
@@ -43,9 +43,7 @@
 #include "nsString.h"
 #include "nsDOMError.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
-#endif // MOZ_SMIL
 
 class nsSVGStylableElement;
 
@@ -69,10 +67,8 @@ public:
 
   nsresult ToDOMAnimatedString(nsIDOMSVGAnimatedString **aResult,
                                nsSVGStylableElement *aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGStylableElement *aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -97,7 +93,6 @@ public:
 
     NS_IMETHOD GetAnimVal(nsAString& aResult);
   };
-#ifdef MOZ_SMIL
   struct SMILString : public nsISMILAttr
   {
   public:
@@ -119,6 +114,5 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 #endif //__NS_SVGCLASS_H__
diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp
index af8bc1450c4..14e6a572161 100644
--- a/content/svg/content/src/nsSVGElement.cpp
+++ b/content/svg/content/src/nsSVGElement.cpp
@@ -86,10 +86,8 @@
 #include "nsIFrame.h"
 #include "prdtoa.h"
 #include <stdarg.h>
-#ifdef MOZ_SMIL
 #include "nsSMILMappedAttribute.h"
 #include "SVGMotionSMILAttr.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -787,7 +785,6 @@ nsSVGElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
     aRuleWalker->Forward(mContentStyleRule);
   }
 
-#ifdef MOZ_SMIL
   // Update & walk the animated content style rule, to include style from
   // animated mapped attributes.  But first, get nsPresContext to check
   // whether this is a "no-animation restyle". (This should match the check
@@ -816,7 +813,6 @@ nsSVGElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
       aRuleWalker->Forward(animContentStyleRule);
     }
   }
-#endif // MOZ_SMIL
 
   return NS_OK;
 }
@@ -1123,7 +1119,6 @@ nsSVGElement::UpdateContentStyleRule()
   mContentStyleRule = mappedAttrParser.CreateStyleRule();
 }
 
-#ifdef MOZ_SMIL
 static void
 ParseMappedAttrAnimValueCallback(void*    aObject,
                                  nsIAtom* aPropertyName,
@@ -1202,7 +1197,6 @@ nsSVGElement::GetAnimatedContentStyleRule()
                                              SMIL_MAPPED_ATTR_STYLERULE_ATOM,
                                              nsnull));
 }
-#endif // MOZ_SMIL
 
 /* static */
 nsIAtom* nsSVGElement::GetEventNameForAttr(nsIAtom* aAttr)
@@ -1221,14 +1215,12 @@ nsIAtom* nsSVGElement::GetEventNameForAttr(nsIAtom* aAttr)
     return nsGkAtoms::onSVGScroll;
   if (aAttr == nsGkAtoms::onzoom)
     return nsGkAtoms::onSVGZoom;
-#ifdef MOZ_SMIL
   if (aAttr == nsGkAtoms::onbegin)
     return nsGkAtoms::onbeginEvent;
   if (aAttr == nsGkAtoms::onrepeat)
     return nsGkAtoms::onrepeatEvent;
   if (aAttr == nsGkAtoms::onend)
     return nsGkAtoms::onendEvent;
-#endif // MOZ_SMIL
 
   return aAttr;
 }
@@ -2130,7 +2122,6 @@ nsSVGElement::RecompileScriptEventListeners()
   }
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGElement::GetAnimatedAttr(PRInt32 aNamespaceID, nsIAtom* aName)
 {
@@ -2327,4 +2318,3 @@ nsSVGElement::FlushAnimations()
     doc->GetAnimationController()->FlushResampleRequests();
   }
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGElement.h b/content/svg/content/src/nsSVGElement.h
index 60d0f9a76e1..1965e4348dd 100644
--- a/content/svg/content/src/nsSVGElement.h
+++ b/content/svg/content/src/nsSVGElement.h
@@ -51,10 +51,8 @@
 #include "nsStyledElement.h"
 #include "mozilla/css/StyleRule.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
 #include "nsSMILAnimationController.h"
-#endif
 
 class nsSVGSVGElement;
 class nsSVGLength2;
@@ -220,14 +218,9 @@ public:
     return nsnull;
   }
 
-#ifdef MOZ_SMIL
   virtual nsISMILAttr* GetAnimatedAttr(PRInt32 aNamespaceID, nsIAtom* aName);
   void AnimationNeedsResample();
   void FlushAnimations();
-#else
-  void AnimationNeedsResample() { /* do nothing */ }
-  void FlushAnimations() { /* do nothing */ }
-#endif
 
   virtual void RecompileScriptEventListeners();
 
@@ -257,10 +250,8 @@ protected:
   virtual bool IsEventName(nsIAtom* aName);
 
   void UpdateContentStyleRule();
-#ifdef MOZ_SMIL
   void UpdateAnimatedContentStyleRule();
   mozilla::css::StyleRule* GetAnimatedContentStyleRule();
-#endif // MOZ_SMIL
 
   static nsIAtom* GetEventNameForAttr(nsIAtom* aAttr);
 
diff --git a/content/svg/content/src/nsSVGElementFactory.cpp b/content/svg/content/src/nsSVGElementFactory.cpp
index 4567d509696..e1861db5475 100644
--- a/content/svg/content/src/nsSVGElementFactory.cpp
+++ b/content/svg/content/src/nsSVGElementFactory.cpp
@@ -223,7 +223,6 @@ nsresult
 NS_NewSVGFEDisplacementMapElement(nsIContent **aResult,
                                   already_AddRefed<nsINodeInfo> aNodeInfo);
 
-#ifdef MOZ_SMIL
 nsresult
 NS_NewSVGAnimateElement(nsIContent **aResult,
                         already_AddRefed<nsINodeInfo> aNodeInfo);
@@ -239,7 +238,6 @@ NS_NewSVGMpathElement(nsIContent **aResult,
 nsresult
 NS_NewSVGSetElement(nsIContent **aResult,
                     already_AddRefed<nsINodeInfo> aNodeInfo);
-#endif // MOZ_SMIL
 
 nsresult
 NS_NewSVGElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo,
@@ -368,7 +366,6 @@ NS_NewSVGElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo,
     return NS_NewSVGMaskElement(aResult, aNodeInfo);
   if (name == nsGkAtoms::svgSwitch)
     return NS_NewSVGSwitchElement(aResult, aNodeInfo);
-#ifdef MOZ_SMIL
   if (NS_SMILEnabled()) {
     if (name == nsGkAtoms::animate)
       return NS_NewSVGAnimateElement(aResult, aNodeInfo);
@@ -381,7 +378,6 @@ NS_NewSVGElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo,
     if (name == nsGkAtoms::set)
       return NS_NewSVGSetElement(aResult, aNodeInfo);
   }
-#endif // MOZ_SMIL
 
   // if we don't know what to create, just create a standard xml element:
   return NS_NewXMLElement(aResult, aNodeInfo);
diff --git a/content/svg/content/src/nsSVGEnum.cpp b/content/svg/content/src/nsSVGEnum.cpp
index 3ab46beabfe..696c436b3f8 100644
--- a/content/svg/content/src/nsSVGEnum.cpp
+++ b/content/svg/content/src/nsSVGEnum.cpp
@@ -37,10 +37,8 @@
 #include "nsSVGEnum.h"
 #include "nsIAtom.h"
 #include "nsSVGElement.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SMILEnumType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -84,11 +82,9 @@ nsSVGEnum::SetBaseValueString(const nsAString& aValue,
         if (!mIsAnimated) {
           mAnimVal = mBaseVal;
         }
-#ifdef MOZ_SMIL
         else {
           aSVGElement->AnimationNeedsResample();
         }
-#endif
         // We don't need to call DidChange* here - we're only called by
         // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
         // which takes care of notifying.
@@ -132,11 +128,9 @@ nsSVGEnum::SetBaseValue(PRUint16 aValue,
         if (!mIsAnimated) {
           mAnimVal = mBaseVal;
         }
-#ifdef MOZ_SMIL
         else {
           aSVGElement->AnimationNeedsResample();
         }
-#endif
         aSVGElement->DidChangeEnum(mAttrEnum, true);
       }
       return NS_OK;
@@ -166,7 +160,6 @@ nsSVGEnum::ToDOMAnimatedEnum(nsIDOMSVGAnimatedEnumeration **aResult,
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGEnum::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -227,4 +220,3 @@ nsSVGEnum::SMILEnum::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGEnum.h b/content/svg/content/src/nsSVGEnum.h
index c867bfac021..8650f2d302d 100644
--- a/content/svg/content/src/nsSVGEnum.h
+++ b/content/svg/content/src/nsSVGEnum.h
@@ -76,10 +76,8 @@ public:
 
   nsresult ToDOMAnimatedEnum(nsIDOMSVGAnimatedEnumeration **aResult,
                              nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
   nsSVGEnumValue mAnimVal;
@@ -111,15 +109,12 @@ public:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetAnimVal(PRUint16* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->GetAnimValue();
       return NS_OK;
     }
   };
 
-#ifdef MOZ_SMIL
   struct SMILEnum : public nsISMILAttr
   {
   public:
@@ -141,7 +136,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 #endif //__NS_SVGENUM_H__
diff --git a/content/svg/content/src/nsSVGInteger.cpp b/content/svg/content/src/nsSVGInteger.cpp
index 32b2e67196a..dced1e93840 100644
--- a/content/svg/content/src/nsSVGInteger.cpp
+++ b/content/svg/content/src/nsSVGInteger.cpp
@@ -35,10 +35,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsSVGInteger.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SMILIntegerType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -94,11 +92,9 @@ nsSVGInteger::SetBaseValueString(const nsAString &aValueAsString,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   return NS_OK;
 }
 
@@ -118,11 +114,9 @@ nsSVGInteger::SetBaseValue(int aValue,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeInteger(mAttrEnum, true);
 }
 
@@ -146,7 +140,6 @@ nsSVGInteger::ToDOMAnimatedInteger(nsIDOMSVGAnimatedInteger **aResult,
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGInteger::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -200,4 +193,3 @@ nsSVGInteger::SMILInteger::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGInteger.h b/content/svg/content/src/nsSVGInteger.h
index f084e2625f2..e2748b9c988 100644
--- a/content/svg/content/src/nsSVGInteger.h
+++ b/content/svg/content/src/nsSVGInteger.h
@@ -74,10 +74,8 @@ public:
   
   nsresult ToDOMAnimatedInteger(nsIDOMSVGAnimatedInteger **aResult,
                                 nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
   
 private:
 
@@ -108,15 +106,12 @@ public:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetAnimVal(PRInt32* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->GetAnimValue();
       return NS_OK;
     }
   };
 
-#ifdef MOZ_SMIL
   struct SMILInteger : public nsISMILAttr
   {
   public:
@@ -138,7 +133,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 #endif //__NS_SVGINTEGER_H__
diff --git a/content/svg/content/src/nsSVGIntegerPair.cpp b/content/svg/content/src/nsSVGIntegerPair.cpp
index 05825e0be3b..b5f5d8b8596 100644
--- a/content/svg/content/src/nsSVGIntegerPair.cpp
+++ b/content/svg/content/src/nsSVGIntegerPair.cpp
@@ -39,10 +39,8 @@
 #include "nsCharSeparatedTokenizer.h"
 #include "nsDOMError.h"
 #include "nsMathUtils.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGIntegerPairSMILType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -119,11 +117,9 @@ nsSVGIntegerPair::SetBaseValueString(const nsAString &aValueAsString,
     mAnimVal[0] = mBaseVal[0];
     mAnimVal[1] = mBaseVal[1];
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   // We don't need to call DidChange* here - we're only called by
   // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
@@ -152,11 +148,9 @@ nsSVGIntegerPair::SetBaseValue(PRInt32 aValue, PairIndex aPairIndex,
   if (!mIsAnimated) {
     mAnimVal[index] = aValue;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeIntegerPair(mAttrEnum, true);
 }
 
@@ -171,11 +165,9 @@ nsSVGIntegerPair::SetBaseValues(PRInt32 aValue1, PRInt32 aValue2,
     mAnimVal[0] = aValue1;
     mAnimVal[1] = aValue2;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeIntegerPair(mAttrEnum, true);
 }
 
@@ -198,7 +190,6 @@ nsSVGIntegerPair::ToDOMAnimatedInteger(nsIDOMSVGAnimatedInteger **aResult,
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGIntegerPair::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -255,4 +246,3 @@ nsSVGIntegerPair::SMILIntegerPair::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGIntegerPair.h b/content/svg/content/src/nsSVGIntegerPair.h
index 4e1d8f53ce6..cf27d3ea567 100644
--- a/content/svg/content/src/nsSVGIntegerPair.h
+++ b/content/svg/content/src/nsSVGIntegerPair.h
@@ -41,11 +41,9 @@
 #include "nsSVGElement.h"
 #include "nsDOMError.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
 class nsSMILValue;
 class nsISMILType;
-#endif // MOZ_SMIL
 
 class nsSVGIntegerPair
 {
@@ -87,10 +85,8 @@ public:
   nsresult ToDOMAnimatedInteger(nsIDOMSVGAnimatedInteger **aResult,
                                 PairIndex aIndex,
                                 nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -125,15 +121,12 @@ public:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetAnimVal(PRInt32* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->GetAnimValue(mIndex);
       return NS_OK;
     }
   };
 
-#ifdef MOZ_SMIL
   struct SMILIntegerPair : public nsISMILAttr
   {
   public:
@@ -155,7 +148,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 #endif //__NS_SVGINTEGERPAIR_H__
diff --git a/content/svg/content/src/nsSVGLength2.cpp b/content/svg/content/src/nsSVGLength2.cpp
index f3fda92db44..4709ae0e8ba 100644
--- a/content/svg/content/src/nsSVGLength2.cpp
+++ b/content/svg/content/src/nsSVGLength2.cpp
@@ -46,10 +46,8 @@
 #include "nsSVGIntegrationUtils.h"
 #include "nsSVGAttrTearoffTable.h"
 #include "nsContentUtils.h" // NS_ENSURE_FINITE
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "nsSMILFloatType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -316,11 +314,9 @@ nsSVGLength2::SetBaseValueInSpecifiedUnits(float aValue,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeLength(mAttrEnum, true);
 }
 
@@ -355,11 +351,9 @@ nsSVGLength2::NewValueSpecifiedUnits(PRUint16 unitType,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeLength(mAttrEnum, true);
   return NS_OK;
 }
@@ -425,11 +419,9 @@ nsSVGLength2::SetBaseValueString(const nsAString &aValueAsString,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   aSVGElement->DidChangeLength(mAttrEnum, aDoSetAttr);
   return NS_OK;
@@ -493,7 +485,6 @@ nsSVGLength2::DOMAnimatedLength::~DOMAnimatedLength()
   sSVGAnimatedLengthTearoffTable.RemoveTearoff(mVal);
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGLength2::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -552,4 +543,3 @@ nsSVGLength2::SMILLength::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGLength2.h b/content/svg/content/src/nsSVGLength2.h
index 78e1bf327eb..a2e557463e6 100644
--- a/content/svg/content/src/nsSVGLength2.h
+++ b/content/svg/content/src/nsSVGLength2.h
@@ -44,11 +44,9 @@
 #include "nsDOMError.h"
 #include "nsMathUtils.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
 class nsSMILValue;
 class nsISMILType;
-#endif // MOZ_SMIL
 
 class nsIFrame;
 
@@ -112,10 +110,8 @@ public:
   
   nsresult ToDOMAnimatedLength(nsIDOMSVGAnimatedLength **aResult,
                                nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
   
@@ -223,18 +219,14 @@ private:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetUnitType(PRUint16* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->mSpecifiedUnitType;
       return NS_OK;
     }
 
     NS_IMETHOD GetValue(float* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->GetAnimValue(mSVGElement);
       return NS_OK;
     }
@@ -243,9 +235,7 @@ private:
 
     NS_IMETHOD GetValueInSpecifiedUnits(float* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->mAnimVal;
       return NS_OK;
     }
@@ -256,9 +246,7 @@ private:
       { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
     NS_IMETHOD GetValueAsString(nsAString& aValue)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       mVal->GetAnimValueString(aValue);
       return NS_OK;
     }
@@ -291,7 +279,6 @@ public:
       { return mVal->ToDOMAnimVal(aAnimVal, mSVGElement); }
   };
 
-#ifdef MOZ_SMIL
   struct SMILLength : public nsISMILAttr
   {
   public:
@@ -313,7 +300,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 #endif //  __NS_SVGLENGTH2_H__
diff --git a/content/svg/content/src/nsSVGNumber2.cpp b/content/svg/content/src/nsSVGNumber2.cpp
index 8b09bada7b4..db015bafc78 100644
--- a/content/svg/content/src/nsSVGNumber2.cpp
+++ b/content/svg/content/src/nsSVGNumber2.cpp
@@ -40,10 +40,8 @@
 #include "prdtoa.h"
 #include "nsMathUtils.h"
 #include "nsContentUtils.h" // NS_ENSURE_FINITE
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "nsSMILFloatType.h"
-#endif // MOZ_SMIL
 
 class DOMSVGNumber : public nsIDOMSVGNumber
 {
@@ -132,11 +130,9 @@ nsSVGNumber2::SetBaseValueString(const nsAString &aValueAsString,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   // We don't need to call DidChange* here - we're only called by
   // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
@@ -160,11 +156,9 @@ nsSVGNumber2::SetBaseValue(float aValue,
   if (!mIsAnimated) {
     mAnimVal = mBaseVal;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeNumber(mAttrEnum, true);
 }
 
@@ -188,7 +182,6 @@ nsSVGNumber2::ToDOMAnimatedNumber(nsIDOMSVGAnimatedNumber **aResult,
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGNumber2::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -245,4 +238,3 @@ nsSVGNumber2::SMILNumber::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGNumber2.h b/content/svg/content/src/nsSVGNumber2.h
index a171d8a5116..81bce3cfffd 100644
--- a/content/svg/content/src/nsSVGNumber2.h
+++ b/content/svg/content/src/nsSVGNumber2.h
@@ -43,11 +43,9 @@
 #include "nsDOMError.h"
 #include "nsMathUtils.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
 class nsSMILValue;
 class nsISMILType;
-#endif // MOZ_SMIL
 
 class nsSVGNumber2
 {
@@ -81,10 +79,8 @@ public:
 
   nsresult ToDOMAnimatedNumber(nsIDOMSVGAnimatedNumber **aResult,
                                nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -121,15 +117,12 @@ public:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetAnimVal(float* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->GetAnimValue();
       return NS_OK;
     }
   };
 
-#ifdef MOZ_SMIL
   struct SMILNumber : public nsISMILAttr
   {
   public:
@@ -151,7 +144,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 #endif //__NS_SVGNUMBER2_H__
diff --git a/content/svg/content/src/nsSVGNumberPair.cpp b/content/svg/content/src/nsSVGNumberPair.cpp
index 6bf74dc6d08..38254fbfcd0 100644
--- a/content/svg/content/src/nsSVGNumberPair.cpp
+++ b/content/svg/content/src/nsSVGNumberPair.cpp
@@ -40,10 +40,8 @@
 #include "prdtoa.h"
 #include "nsDOMError.h"
 #include "nsMathUtils.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGNumberPairSMILType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -119,11 +117,9 @@ nsSVGNumberPair::SetBaseValueString(const nsAString &aValueAsString,
     mAnimVal[0] = mBaseVal[0];
     mAnimVal[1] = mBaseVal[1];
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   // We don't need to call DidChange* here - we're only called by
   // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
@@ -152,11 +148,9 @@ nsSVGNumberPair::SetBaseValue(float aValue, PairIndex aPairIndex,
   if (!mIsAnimated) {
     mAnimVal[index] = aValue;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeNumberPair(mAttrEnum, true);
 }
 
@@ -171,11 +165,9 @@ nsSVGNumberPair::SetBaseValues(float aValue1, float aValue2,
     mAnimVal[0] = aValue1;
     mAnimVal[1] = aValue2;
   }
-#ifdef MOZ_SMIL
   else {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
   aSVGElement->DidChangeNumberPair(mAttrEnum, true);
 }
 
@@ -198,7 +190,6 @@ nsSVGNumberPair::ToDOMAnimatedNumber(nsIDOMSVGAnimatedNumber **aResult,
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGNumberPair::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -255,4 +246,3 @@ nsSVGNumberPair::SMILNumberPair::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGNumberPair.h b/content/svg/content/src/nsSVGNumberPair.h
index 182deb135d5..60f723564cb 100644
--- a/content/svg/content/src/nsSVGNumberPair.h
+++ b/content/svg/content/src/nsSVGNumberPair.h
@@ -43,11 +43,9 @@
 #include "nsDOMError.h"
 #include "nsMathUtils.h"
 
-#ifdef MOZ_SMIL
 #include "nsISMILAttr.h"
 class nsSMILValue;
 class nsISMILType;
-#endif // MOZ_SMIL
 
 class nsSVGNumberPair
 {
@@ -89,10 +87,8 @@ public:
   nsresult ToDOMAnimatedNumber(nsIDOMSVGAnimatedNumber **aResult,
                                PairIndex aIndex,
                                nsSVGElement* aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -130,15 +126,12 @@ public:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetAnimVal(float* aResult)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aResult = mVal->GetAnimValue(mIndex);
       return NS_OK;
     }
   };
 
-#ifdef MOZ_SMIL
   struct SMILNumberPair : public nsISMILAttr
   {
   public:
@@ -160,7 +153,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 #endif //__NS_SVGNUMBERPAIR_H__
diff --git a/content/svg/content/src/nsSVGSVGElement.cpp b/content/svg/content/src/nsSVGSVGElement.cpp
index cd9622ecb22..bda06d508a5 100644
--- a/content/svg/content/src/nsSVGSVGElement.cpp
+++ b/content/svg/content/src/nsSVGSVGElement.cpp
@@ -63,7 +63,6 @@
 #include "nsContentErrors.h" // For NS_PROPTABLE_PROP_OVERWRITTEN
 #include "nsContentUtils.h"
 
-#ifdef MOZ_SMIL
 #include "nsEventDispatcher.h"
 #include "nsSMILTimeContainer.h"
 #include "nsSMILAnimationController.h"
@@ -71,7 +70,6 @@
 #include "nsIContentIterator.h"
 
 nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult);
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -163,7 +161,6 @@ NS_IMPL_NS_NEW_SVG_ELEMENT_CHECK_PARSER(SVG)
 //----------------------------------------------------------------------
 // nsISupports methods
 
-#ifdef MOZ_SMIL
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsSVGSVGElement)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsSVGSVGElement,
                                                 nsSVGSVGElementBase)
@@ -177,18 +174,13 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsSVGSVGElement,
     tmp->mTimedDocumentRoot->Traverse(&cb);
   }
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-#endif // MOZ_SMIL
 
 NS_IMPL_ADDREF_INHERITED(nsSVGSVGElement,nsSVGSVGElementBase)
 NS_IMPL_RELEASE_INHERITED(nsSVGSVGElement,nsSVGSVGElementBase)
 
 DOMCI_NODE_DATA(SVGSVGElement, nsSVGSVGElement)
 
-#ifdef MOZ_SMIL
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsSVGSVGElement)
-#else
-NS_INTERFACE_TABLE_HEAD(nsSVGSVGElement)
-#endif
   NS_NODE_INTERFACE_TABLE7(nsSVGSVGElement, nsIDOMNode, nsIDOMElement,
                            nsIDOMSVGElement, nsIDOMSVGSVGElement,
                            nsIDOMSVGFitToViewBox, nsIDOMSVGLocatable,
@@ -209,12 +201,10 @@ nsSVGSVGElement::nsSVGSVGElement(already_AddRefed<nsINodeInfo> aNodeInfo,
     mCurrentScale(1.0f),
     mPreviousTranslate(0.0f, 0.0f),
     mPreviousScale(1.0f),
-    mRedrawSuspendCount(0)
-#ifdef MOZ_SMIL
-  , mStartAnimationOnBindToTree(!aFromParser)
-#endif // MOZ_SMIL
-  , mImageNeedsTransformInvalidation(false)
-  , mIsPaintingSVGImageElement(false)
+    mRedrawSuspendCount(0),
+    mStartAnimationOnBindToTree(!aFromParser),
+    mImageNeedsTransformInvalidation(false),
+    mIsPaintingSVGImageElement(false)
 {
 }
 
@@ -454,7 +444,6 @@ nsSVGSVGElement::ForceRedraw()
 NS_IMETHODIMP
 nsSVGSVGElement::PauseAnimations()
 {
-#ifdef MOZ_SMIL
   if (NS_SMILEnabled()) {
     if (mTimedDocumentRoot) {
       mTimedDocumentRoot->Pause(nsSMILTimeContainer::PAUSE_SCRIPT);
@@ -462,7 +451,6 @@ nsSVGSVGElement::PauseAnimations()
     // else we're not the outermost <svg> or not bound to a tree, so silently fail
     return NS_OK;
   }
-#endif // MOZ_SMIL
   NS_NOTYETIMPLEMENTED("nsSVGSVGElement::PauseAnimations");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -471,7 +459,6 @@ nsSVGSVGElement::PauseAnimations()
 NS_IMETHODIMP
 nsSVGSVGElement::UnpauseAnimations()
 {
-#ifdef MOZ_SMIL
   if (NS_SMILEnabled()) {
     if (mTimedDocumentRoot) {
       mTimedDocumentRoot->Resume(nsSMILTimeContainer::PAUSE_SCRIPT);
@@ -479,7 +466,6 @@ nsSVGSVGElement::UnpauseAnimations()
     // else we're not the outermost <svg> or not bound to a tree, so silently fail
     return NS_OK;
   }
-#endif // MOZ_SMIL
   NS_NOTYETIMPLEMENTED("nsSVGSVGElement::UnpauseAnimations");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -488,13 +474,11 @@ nsSVGSVGElement::UnpauseAnimations()
 NS_IMETHODIMP
 nsSVGSVGElement::AnimationsPaused(bool *_retval)
 {
-#ifdef MOZ_SMIL
   if (NS_SMILEnabled()) {
     nsSMILTimeContainer* root = GetTimedDocumentRoot();
     *_retval = root && root->IsPausedByType(nsSMILTimeContainer::PAUSE_SCRIPT);
     return NS_OK;
   }
-#endif // MOZ_SMIL
   NS_NOTYETIMPLEMENTED("nsSVGSVGElement::AnimationsPaused");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -503,7 +487,6 @@ nsSVGSVGElement::AnimationsPaused(bool *_retval)
 NS_IMETHODIMP
 nsSVGSVGElement::GetCurrentTime(float *_retval)
 {
-#ifdef MOZ_SMIL
   if (NS_SMILEnabled()) {
     nsSMILTimeContainer* root = GetTimedDocumentRoot();
     if (root) {
@@ -514,7 +497,6 @@ nsSVGSVGElement::GetCurrentTime(float *_retval)
     }
     return NS_OK;
   }
-#endif // MOZ_SMIL
   NS_NOTYETIMPLEMENTED("nsSVGSVGElement::GetCurrentTime");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -524,7 +506,6 @@ NS_IMETHODIMP
 nsSVGSVGElement::SetCurrentTime(float seconds)
 {
   NS_ENSURE_FINITE(seconds, NS_ERROR_ILLEGAL_VALUE);
-#ifdef MOZ_SMIL
   if (NS_SMILEnabled()) {
     if (mTimedDocumentRoot) {
       // Make sure the timegraph is up-to-date
@@ -545,7 +526,6 @@ nsSVGSVGElement::SetCurrentTime(float seconds)
       // fail
     return NS_OK;
   }
-#endif // MOZ_SMIL
   NS_NOTYETIMPLEMENTED("nsSVGSVGElement::SetCurrentTime");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -868,7 +848,6 @@ nsSVGSVGElement::SetCurrentTranslate(float x, float y)
   return SetCurrentScaleTranslate(mCurrentScale, x, y);
 }
 
-#ifdef MOZ_SMIL
 nsSMILTimeContainer*
 nsSVGSVGElement::GetTimedDocumentRoot()
 {
@@ -886,7 +865,6 @@ nsSVGSVGElement::GetTimedDocumentRoot()
   // invalid structure
   return nsnull;
 }
-#endif // MOZ_SMIL
 
 //----------------------------------------------------------------------
 // nsIContent methods
@@ -915,7 +893,6 @@ nsSVGSVGElement::IsAttributeMapped(const nsIAtom* name) const
 //----------------------------------------------------------------------
 // nsIContent methods:
 
-#ifdef MOZ_SMIL
 nsresult
 nsSVGSVGElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
 {
@@ -930,7 +907,6 @@ nsSVGSVGElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
   }
   return nsSVGSVGElementBase::PreHandleEvent(aVisitor);
 }
-#endif // MOZ_SMIL
 
 //----------------------------------------------------------------------
 // nsSVGElement overrides
@@ -1036,7 +1012,6 @@ nsSVGSVGElement::GetViewBoxTransform() const
                                          mPreserveAspectRatio.GetAnimValue());
 }
 
-#ifdef MOZ_SMIL
 nsresult
 nsSVGSVGElement::BindToTree(nsIDocument* aDocument,
                             nsIContent* aParent,
@@ -1090,12 +1065,10 @@ nsSVGSVGElement::UnbindFromTree(bool aDeep, bool aNullParent)
 
   nsSVGSVGElementBase::UnbindFromTree(aDeep, aNullParent);
 }
-#endif // MOZ_SMIL
 
 //----------------------------------------------------------------------
 // implementation helpers
 
-#ifdef MOZ_SMIL
 bool
 nsSVGSVGElement::WillBeOutermostSVG(nsIContent* aParent,
                                     nsIContent* aBindingParent) const
@@ -1116,7 +1089,6 @@ nsSVGSVGElement::WillBeOutermostSVG(nsIContent* aParent,
 
   return true;
 }
-#endif // MOZ_SMIL
 
 void
 nsSVGSVGElement::InvalidateTransformNotifyFrame()
diff --git a/content/svg/content/src/nsSVGSVGElement.h b/content/svg/content/src/nsSVGSVGElement.h
index ca207fe86a1..67154446824 100644
--- a/content/svg/content/src/nsSVGSVGElement.h
+++ b/content/svg/content/src/nsSVGSVGElement.h
@@ -53,9 +53,7 @@
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "mozilla/dom/FromParser.h"
 
-#ifdef MOZ_SMIL
 class nsSMILTimeContainer;
-#endif // MOZ_SMIL
 
 typedef nsSVGStylableElement nsSVGSVGElementBase;
 
@@ -141,9 +139,7 @@ public:
 
   // interfaces:
   NS_DECL_ISUPPORTS_INHERITED
-#ifdef MOZ_SMIL
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsSVGSVGElement, nsSVGSVGElementBase)
-#endif // MOZ_SMIL
   NS_DECL_NSIDOMSVGSVGELEMENT
   NS_DECL_NSIDOMSVGFITTOVIEWBOX
   NS_DECL_NSIDOMSVGLOCATABLE
@@ -181,15 +177,11 @@ public:
   const nsSVGTranslatePoint& GetPreviousTranslate() { return mPreviousTranslate; }
   float GetPreviousScale() { return mPreviousScale; }
 
-#ifdef MOZ_SMIL
   nsSMILTimeContainer* GetTimedDocumentRoot();
-#endif // MOZ_SMIL
 
   // nsIContent interface
   NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
-#ifdef MOZ_SMIL
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
-#endif // MOZ_SMIL
 
   // nsSVGElement specializations:
   virtual gfxMatrix PrependLocalTransformTo(const gfxMatrix &aMatrix) const;
@@ -237,12 +229,10 @@ protected:
   // nsSVGElement overrides
   bool IsEventName(nsIAtom* aName);
 
-#ifdef MOZ_SMIL
   virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                               nsIContent* aBindingParent,
                               bool aCompileEventHandlers);
   virtual void UnbindFromTree(bool aDeep, bool aNullParent);
-#endif // MOZ_SMIL
 
   // implementation helpers:
 
@@ -263,7 +253,6 @@ protected:
            parent->Tag() != nsGkAtoms::foreignObject;
   }
 
-#ifdef MOZ_SMIL
   /* 
    * While binding to the tree we need to determine if we will be the outermost
    * <svg> element _before_ the children are bound (as they want to know what
@@ -275,7 +264,6 @@ protected:
    */
   bool WillBeOutermostSVG(nsIContent* aParent,
                             nsIContent* aBindingParent) const;
-#endif // MOZ_SMIL
 
   // invalidate viewbox -> viewport xform & inform frames
   void InvalidateTransformNotifyFrame();
@@ -316,11 +304,9 @@ protected:
   // XXXjwatt our frame should probably reset these when it's destroyed.
   float mViewportWidth, mViewportHeight;
 
-#ifdef MOZ_SMIL
   // The time container for animations within this SVG document fragment. Set
   // for all outermost <svg> elements (not nested <svg> elements).
   nsAutoPtr<nsSMILTimeContainer> mTimedDocumentRoot;
-#endif // MOZ_SMIL
 
   // zoom and pan
   // IMPORTANT: see the comment in RecordCurrentScaleTranslate before writing
@@ -331,13 +317,11 @@ protected:
   float                             mPreviousScale;
   PRInt32                           mRedrawSuspendCount;
 
-#ifdef MOZ_SMIL
   // For outermost <svg> elements created from parsing, animation is started by
   // the onload event in accordance with the SVG spec, but for <svg> elements
   // created by script or promoted from inner <svg> to outermost <svg> we need
   // to manually kick off animation when they are bound to the tree.
   bool                              mStartAnimationOnBindToTree;
-#endif // MOZ_SMIL
   bool                              mImageNeedsTransformInvalidation;
   bool                              mIsPaintingSVGImageElement;
 };
diff --git a/content/svg/content/src/nsSVGString.cpp b/content/svg/content/src/nsSVGString.cpp
index bd03566bfa4..703d572a33c 100644
--- a/content/svg/content/src/nsSVGString.cpp
+++ b/content/svg/content/src/nsSVGString.cpp
@@ -35,10 +35,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsSVGString.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SMILStringType.h"
-#endif // MOZ_SMIL
 
 using namespace mozilla;
 
@@ -68,11 +66,9 @@ nsSVGString::SetBaseValue(const nsAString& aValue,
   if (aDoSetAttr) {
     aSVGElement->SetStringBaseValue(mAttrEnum, aValue);
   }
-#ifdef MOZ_SMIL
   if (mAnimVal) {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 
   aSVGElement->DidChangeString(mAttrEnum);
 }
@@ -112,7 +108,6 @@ nsSVGString::ToDOMAnimatedString(nsIDOMSVGAnimatedString **aResult,
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGString::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -160,4 +155,3 @@ nsSVGString::SMILString::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGString.h b/content/svg/content/src/nsSVGString.h
index fdc0c1a3247..597dd5fd0c2 100644
--- a/content/svg/content/src/nsSVGString.h
+++ b/content/svg/content/src/nsSVGString.h
@@ -70,10 +70,8 @@ public:
 
   nsresult ToDOMAnimatedString(nsIDOMSVGAnimatedString **aResult,
                                nsSVGElement *aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement *aSVGElement);
-#endif // MOZ_SMIL
 
 private:
 
@@ -100,14 +98,11 @@ public:
 
     NS_IMETHOD GetAnimVal(nsAString & aResult)
     { 
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       mVal->GetAnimValue(aResult, mSVGElement); return NS_OK;
     }
 
   };
-#ifdef MOZ_SMIL
   struct SMILString : public nsISMILAttr
   {
   public:
@@ -129,6 +124,5 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 #endif //__NS_SVGSTRING_H__
diff --git a/content/svg/content/src/nsSVGStylableElement.cpp b/content/svg/content/src/nsSVGStylableElement.cpp
index 346cb1dcf15..f15859547ef 100644
--- a/content/svg/content/src/nsSVGStylableElement.cpp
+++ b/content/svg/content/src/nsSVGStylableElement.cpp
@@ -149,7 +149,6 @@ nsSVGStylableElement::DidAnimateClass()
   }
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGStylableElement::GetAnimatedAttr(PRInt32 aNamespaceID, nsIAtom* aName)
 {
@@ -159,4 +158,3 @@ nsSVGStylableElement::GetAnimatedAttr(PRInt32 aNamespaceID, nsIAtom* aName)
   }
   return nsSVGStylableElementBase::GetAnimatedAttr(aNamespaceID, aName);
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGStylableElement.h b/content/svg/content/src/nsSVGStylableElement.h
index 61735c5cdb7..1e61a518af9 100644
--- a/content/svg/content/src/nsSVGStylableElement.h
+++ b/content/svg/content/src/nsSVGStylableElement.h
@@ -69,9 +69,7 @@ public:
   virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
                              bool aNotify);
 
-#ifdef MOZ_SMIL
   virtual nsISMILAttr* GetAnimatedAttr(PRInt32 aNamespaceID, nsIAtom* aName);
-#endif
 
   void DidAnimateClass();
 
diff --git a/content/svg/content/src/nsSVGViewBox.cpp b/content/svg/content/src/nsSVGViewBox.cpp
index 3a45c6f76d4..3c34bb5fa41 100644
--- a/content/svg/content/src/nsSVGViewBox.cpp
+++ b/content/svg/content/src/nsSVGViewBox.cpp
@@ -42,10 +42,8 @@
 #include "nsTextFormatter.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsMathUtils.h"
-#ifdef MOZ_SMIL
 #include "nsSMILValue.h"
 #include "SVGViewBoxSMILType.h"
-#endif // MOZ_SMIL
 
 #define NUM_VIEWBOX_COMPONENTS 4
 using namespace mozilla;
@@ -133,11 +131,9 @@ nsSVGViewBox::SetBaseValue(float aX, float aY, float aWidth, float aHeight,
   mHasBaseVal = true;
 
   aSVGElement->DidChangeViewBox(true);
-#ifdef MOZ_SMIL
   if (mAnimVal) {
     aSVGElement->AnimationNeedsResample();
   }
-#endif
 }
 
 static nsresult
@@ -186,11 +182,9 @@ nsSVGViewBox::SetBaseValueString(const nsAString& aValue,
     mBaseVal = nsSVGViewBoxRect(viewBox.x, viewBox.y, viewBox.width, viewBox.height);
     mHasBaseVal = true;
 
-#ifdef MOZ_SMIL
     if (mAnimVal) {
       aSVGElement->AnimationNeedsResample();
     }
-#endif
     // We don't need to call DidChange* here - we're only called by
     // nsSVGElement::ParseAttribute under nsGenericElement::SetAttr,
     // which takes care of notifying.
@@ -280,7 +274,6 @@ nsSVGViewBox::DOMBaseVal::SetHeight(float aHeight)
   return NS_OK;
 }
 
-#ifdef MOZ_SMIL
 nsISMILAttr*
 nsSVGViewBox::ToSMILAttr(nsSVGElement *aSVGElement)
 {
@@ -335,4 +328,3 @@ nsSVGViewBox::SMILViewBox::SetAnimValue(const nsSMILValue& aValue)
   }
   return NS_OK;
 }
-#endif // MOZ_SMIL
diff --git a/content/svg/content/src/nsSVGViewBox.h b/content/svg/content/src/nsSVGViewBox.h
index 2e41e4039e0..c2bf45e766a 100644
--- a/content/svg/content/src/nsSVGViewBox.h
+++ b/content/svg/content/src/nsSVGViewBox.h
@@ -84,10 +84,8 @@ public:
 
   nsresult ToDOMAnimatedRect(nsIDOMSVGAnimatedRect **aResult,
                              nsSVGElement *aSVGElement);
-#ifdef MOZ_SMIL
   // Returns a new nsISMILAttr object that the caller must delete
   nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
-#endif // MOZ_SMIL
   
 private:
 
@@ -136,33 +134,25 @@ private:
     // need to flush any resample requests to reflect these modifications.
     NS_IMETHOD GetX(float *aX)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aX = mVal->GetAnimValue().x;
       return NS_OK;
     }
     NS_IMETHOD GetY(float *aY)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aY = mVal->GetAnimValue().y;
       return NS_OK;
     }
     NS_IMETHOD GetWidth(float *aWidth)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aWidth = mVal->GetAnimValue().width;
       return NS_OK;
     }
     NS_IMETHOD GetHeight(float *aHeight)
     {
-#ifdef MOZ_SMIL
       mSVGElement->FlushAnimations();
-#endif
       *aHeight = mVal->GetAnimValue().height;
       return NS_OK;
     }
@@ -193,7 +183,6 @@ public:
     NS_IMETHOD GetAnimVal(nsIDOMSVGRect **aResult);
   };
 
-#ifdef MOZ_SMIL
   struct SMILViewBox : public nsISMILAttr
   {
   public:
@@ -215,7 +204,6 @@ public:
     virtual void ClearAnimValue();
     virtual nsresult SetAnimValue(const nsSMILValue& aValue);
   };
-#endif // MOZ_SMIL
 };
 
 #endif // __NS_SVGVIEWBOX_H__
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 6b3e4f48a5a..342e4298f4d 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -3748,6 +3748,9 @@ nsDocShell::LoadURI(const PRUnichar * aURI,
         if (aLoadFlags & LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) {
           fixupFlags |= nsIURIFixup::FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP;
         }
+        if (aLoadFlags & LOAD_FLAGS_URI_IS_UTF8) {
+          fixupFlags |= nsIURIFixup::FIXUP_FLAG_USE_UTF8;
+        }
         rv = sURIFixup->CreateFixupURI(uriString, fixupFlags,
                                        getter_AddRefs(uri));
     }
diff --git a/docshell/base/nsIWebNavigation.idl b/docshell/base/nsIWebNavigation.idl
index 0710e38f495..75ab19a29c8 100644
--- a/docshell/base/nsIWebNavigation.idl
+++ b/docshell/base/nsIWebNavigation.idl
@@ -219,6 +219,11 @@ interface nsIWebNavigation : nsISupports
    */
   const unsigned long LOAD_FLAGS_DISALLOW_INHERIT_OWNER = 0x40000;
 
+  /**
+   * Assume the URI is encoded in UTF-8.
+   */
+  const unsigned long LOAD_FLAGS_URI_IS_UTF8 = 0x80000;
+
   /**
    * Loads a given URI.  This will give priority to loading the requested URI
    * in the object implementing	this interface.  If it can't be loaded here
diff --git a/dom/Makefile.in b/dom/Makefile.in
index 16eeefd828a..af0fdabdba0 100644
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -43,6 +43,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
+
 DIRS = \
   interfaces/base \
   interfaces/canvas \
@@ -64,12 +65,9 @@ DIRS = \
   interfaces/geolocation \
   interfaces/notification \
   interfaces/svg \
+  interfaces/smil \
   $(NULL)
 
-ifdef MOZ_SMIL
-DIRS += interfaces/smil
-endif
-
 DIRS += \
   base \
   battery \
@@ -95,4 +93,3 @@ endif
 endif
 
 include $(topsrcdir)/config/rules.mk
-
diff --git a/dom/base/ConsoleAPI.js b/dom/base/ConsoleAPI.js
index 03eeaca0dcd..a2239eab951 100644
--- a/dom/base/ConsoleAPI.js
+++ b/dom/base/ConsoleAPI.js
@@ -24,6 +24,7 @@
  *  Ryan Flint <rflint@mozilla.com>
  *  Rob Campbell <rcampbell@mozilla.com>
  *  Mihai Sucan <mihai.sucan@gmail.com>
+ *  Panos Astithas <past@mozilla.com>
  *
  * 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
@@ -42,6 +43,8 @@
 let Cu = Components.utils;
 let Ci = Components.interfaces;
 let Cc = Components.classes;
+// The maximum allowed number of concurrent timers per page.
+const MAX_PAGE_TIMERS = 10000;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -56,6 +59,9 @@ ConsoleAPI.prototype = {
 
   // nsIDOMGlobalPropertyInitializer
   init: function CA_init(aWindow) {
+    Services.obs.addObserver(this, "xpcom-shutdown", false);
+    Services.obs.addObserver(this, "inner-window-destroyed", false);
+
     let outerID;
     let innerID;
     try {
@@ -103,6 +109,12 @@ ConsoleAPI.prototype = {
       groupEnd: function CA_groupEnd() {
         self.notifyObservers(outerID, innerID, "groupEnd", arguments);
       },
+      time: function CA_time() {
+        self.notifyObservers(outerID, innerID, "time", self.startTimer(innerID, arguments[0]));
+      },
+      timeEnd: function CA_timeEnd() {
+        self.notifyObservers(outerID, innerID, "timeEnd", self.stopTimer(innerID, arguments[0]));
+      },
       __exposedProps__: {
         log: "r",
         info: "r",
@@ -113,7 +125,9 @@ ConsoleAPI.prototype = {
         dir: "r",
         group: "r",
         groupCollapsed: "r",
-        groupEnd: "r"
+        groupEnd: "r",
+        time: "r",
+        timeEnd: "r"
       }
     };
 
@@ -135,6 +149,8 @@ ConsoleAPI.prototype = {
       group: genPropDesc('group'),
       groupCollapsed: genPropDesc('groupCollapsed'),
       groupEnd: genPropDesc('groupEnd'),
+      time: genPropDesc('time'),
+      timeEnd: genPropDesc('timeEnd'),
       __noSuchMethod__: { enumerable: true, configurable: true, writable: true,
                           value: function() {} },
       __mozillaConsole__: { value: true }
@@ -146,6 +162,18 @@ ConsoleAPI.prototype = {
     return contentObj;
   },
 
+  observe: function CA_observe(aSubject, aTopic, aData)
+  {
+    if (aTopic == "xpcom-shutdown") {
+      Services.obs.removeObserver(this, "xpcom-shutdown");
+      Services.obs.removeObserver(this, "inner-window-destroyed");
+    }
+    else if (aTopic == "inner-window-destroyed") {
+      let innerWindowID = aSubject.QueryInterface(Ci.nsISupportsPRUint64).data;
+      delete this.timerRegistry[innerWindowID + ""];
+    }
+  },
+
   /**
    * Notify all observers of any console API call.
    *
@@ -254,6 +282,76 @@ ConsoleAPI.prototype = {
    **/
   beginGroup: function CA_beginGroup() {
     return Array.prototype.join.call(arguments[0], " ");
+  },
+
+  /*
+   * A registry of started timers. It contains a map of pages (defined by their
+   * inner window IDs) to timer maps. Timer maps are key-value pairs of timer
+   * names to timer start times, for all timers defined in that page. Timer
+   * names are prepended with the inner window ID in order to avoid conflicts
+   * with Object.prototype functions.
+   */
+  timerRegistry: {},
+
+  /**
+   * Create a new timer by recording the current time under the specified name.
+   *
+   * @param number aWindowId
+   *        The inner ID of the window.
+   * @param string aName
+   *        The name of the timer.
+   * @return object
+   *        The name property holds the timer name and the started property
+   *        holds the time the timer was started. In case of error, it returns
+   *        an object with the single property "error" that contains the key
+   *        for retrieving the localized error message.
+   **/
+  startTimer: function CA_startTimer(aWindowId, aName) {
+    if (!aName) {
+        return;
+    }
+    let innerID = aWindowId + "";
+    if (!this.timerRegistry[innerID]) {
+        this.timerRegistry[innerID] = {};
+    }
+    let pageTimers = this.timerRegistry[innerID];
+    if (Object.keys(pageTimers).length > MAX_PAGE_TIMERS - 1) {
+        return { error: "maxTimersExceeded" };
+    }
+    let key = aWindowId + "-" + aName.toString();
+    if (!pageTimers[key]) {
+        pageTimers[key] = Date.now();
+    }
+    return { name: aName, started: pageTimers[key] };
+  },
+
+  /**
+   * Stop the timer with the specified name and retrieve the elapsed time.
+   *
+   * @param number aWindowId
+   *        The inner ID of the window.
+   * @param string aName
+   *        The name of the timer.
+   * @return object
+   *        The name property holds the timer name and the duration property
+   *        holds the number of milliseconds since the timer was started.
+   **/
+  stopTimer: function CA_stopTimer(aWindowId, aName) {
+    if (!aName) {
+        return;
+    }
+    let innerID = aWindowId + "";
+    let pageTimers = this.timerRegistry[innerID];
+    if (!pageTimers) {
+        return;
+    }
+    let key = aWindowId + "-" + aName.toString();
+    if (!pageTimers[key]) {
+        return;
+    }
+    let duration = Date.now() - pageTimers[key];
+    delete pageTimers[key];
+    return { name: aName, duration: duration };
   }
 };
 
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index cb445ec68fa..4c2a077f525 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -372,7 +372,6 @@
 #include "nsIDOMSVGAnimatedRect.h"
 #include "nsIDOMSVGAnimatedString.h"
 #include "nsIDOMSVGAnimPresAspRatio.h"
-#ifdef MOZ_SMIL
 #include "nsIDOMSVGAnimateElement.h"
 #include "nsIDOMSVGAnimateTransformElement.h"
 #include "nsIDOMSVGAnimateMotionElement.h"
@@ -381,7 +380,6 @@
 #include "nsIDOMSVGAnimationElement.h"
 #include "nsIDOMElementTimeControl.h"
 #include "nsIDOMTimeEvent.h"
-#endif // MOZ_SMIL
 #include "nsIDOMSVGAnimTransformList.h"
 #include "nsIDOMSVGCircleElement.h"
 #include "nsIDOMSVGClipPathElement.h"
@@ -1032,7 +1030,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGAltGlyphElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-#ifdef MOZ_SMIL
   NS_DEFINE_CLASSINFO_DATA(SVGAnimateElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGAnimateTransformElement, nsElementSH,
@@ -1045,7 +1042,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(TimeEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
-#endif // MOZ_SMIL
   NS_DEFINE_CLASSINFO_DATA(SVGCircleElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGClipPathElement, nsElementSH,
@@ -3063,7 +3059,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-#ifdef MOZ_SMIL
   DOM_CLASSINFO_MAP_BEGIN(SVGAnimateElement, nsIDOMSVGAnimateElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimationElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimateElement)
@@ -3104,7 +3099,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMTimeEvent)
     DOM_CLASSINFO_EVENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
-#endif // MOZ_SMIL
 
   DOM_CLASSINFO_MAP_BEGIN(SVGCircleElement, nsIDOMSVGCircleElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGCircleElement)
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 506f5a173ce..893228bac28 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -234,14 +234,12 @@ DOMCI_CLASS(SVGDocument)
 // SVG element classes
 DOMCI_CLASS(SVGAElement)
 DOMCI_CLASS(SVGAltGlyphElement)
-#ifdef MOZ_SMIL
 DOMCI_CLASS(SVGAnimateElement)
 DOMCI_CLASS(SVGAnimateTransformElement)
 DOMCI_CLASS(SVGAnimateMotionElement)
 DOMCI_CLASS(SVGMpathElement)
 DOMCI_CLASS(SVGSetElement)
 DOMCI_CLASS(TimeEvent)
-#endif // MOZ_SMIL
 DOMCI_CLASS(SVGCircleElement)
 DOMCI_CLASS(SVGClipPathElement)
 DOMCI_CLASS(SVGDefsElement)
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 23e4324935f..79e62392c5f 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1917,6 +1917,7 @@ nsJSContext::CallEventHandler(nsISupports* aTarget, JSObject* aScope,
     js::ForceFrame ff(mContext, funobj);
     if (!ac.enter(mContext, funobj) || !ff.enter() ||
         !JS_WrapObject(mContext, &target)) {
+      ReportPendingException();
       sSecurityManager->PopContextPrincipal(mContext);
       return NS_ERROR_FAILURE;
     }
diff --git a/dom/indexedDB/nsIIDBVersionChangeEvent.idl b/dom/indexedDB/nsIIDBVersionChangeEvent.idl
index 73eb395006d..f1e8c456270 100644
--- a/dom/indexedDB/nsIIDBVersionChangeEvent.idl
+++ b/dom/indexedDB/nsIIDBVersionChangeEvent.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, builtinclass, uuid(2c5159dc-7d71-4fc6-a3b3-884ed7586456)]
+[scriptable, builtinclass, uuid(52e21085-d6cd-4886-a5eb-19b47d13abf6)]
 interface nsIIDBVersionChangeEvent : nsIDOMEvent
 {
   readonly attribute unsigned long long oldVersion;
diff --git a/dom/interfaces/events/nsIDOMAnimationEvent.idl b/dom/interfaces/events/nsIDOMAnimationEvent.idl
index bca17389c38..10804786509 100644
--- a/dom/interfaces/events/nsIDOMAnimationEvent.idl
+++ b/dom/interfaces/events/nsIDOMAnimationEvent.idl
@@ -43,7 +43,7 @@
  * http://dev.w3.org/csswg/css3-animations/#animation-events-
  */
 
-[scriptable, uuid(656d5f7c-c116-4154-8afd-f2c7458c7fb7)]
+[scriptable, uuid(cf76ec40-85fb-4623-b637-59a50af36d60)]
 interface nsIDOMAnimationEvent : nsIDOMEvent {
   readonly attribute DOMString          animationName;
   readonly attribute float              elapsedTime;
diff --git a/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl b/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
index 10c92e4dc53..e0968cf9970 100644
--- a/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
+++ b/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
@@ -48,7 +48,7 @@
  *
  */
 
-[scriptable, uuid(da19e9dc-dea2-4a1d-a958-9be375c9799c)]
+[scriptable, uuid(d286b454-0ed0-4e4b-b51d-3cf6d8c1299d)]
 interface nsIDOMBeforeUnloadEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMCloseEvent.idl b/dom/interfaces/events/nsIDOMCloseEvent.idl
index 8807705d2f8..feaecd48213 100644
--- a/dom/interfaces/events/nsIDOMCloseEvent.idl
+++ b/dom/interfaces/events/nsIDOMCloseEvent.idl
@@ -45,7 +45,7 @@
  * For more information on this interface, please see
  * http://dev.w3.org/html5/websockets/#closeevent
  */
-[scriptable, uuid(f83d9d6d-6c0c-418c-b12a-438e76d5866b)]
+[scriptable, uuid(07fb24d2-a102-41a2-bdaa-eb5e0d399eba)]
 interface nsIDOMCloseEvent : nsIDOMEvent
 {
   readonly attribute boolean wasClean;
diff --git a/dom/interfaces/events/nsIDOMCommandEvent.idl b/dom/interfaces/events/nsIDOMCommandEvent.idl
index 5c33cb49279..37023b3a5a5 100644
--- a/dom/interfaces/events/nsIDOMCommandEvent.idl
+++ b/dom/interfaces/events/nsIDOMCommandEvent.idl
@@ -37,7 +37,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, uuid(37fb1798-0f76-4870-af6f-0135b4d973c8)]
+[scriptable, uuid(cfdbc647-847f-4bd9-8595-5dd0a1592b7b)]
 interface nsIDOMCommandEvent : nsIDOMEvent
 {
   readonly attribute DOMString command;
diff --git a/dom/interfaces/events/nsIDOMCompositionEvent.idl b/dom/interfaces/events/nsIDOMCompositionEvent.idl
index a31cf9cb6b5..08961ed0f95 100644
--- a/dom/interfaces/events/nsIDOMCompositionEvent.idl
+++ b/dom/interfaces/events/nsIDOMCompositionEvent.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(bf01c23c-cf5f-4a8e-86a7-040c6e45d685)]
+[scriptable, uuid(9244a692-2827-4f98-8335-fff958d046fc)]
 interface nsIDOMCompositionEvent : nsIDOMUIEvent
 {
   readonly attribute DOMString data;
diff --git a/dom/interfaces/events/nsIDOMCustomEvent.idl b/dom/interfaces/events/nsIDOMCustomEvent.idl
index 06ea9f211f7..15769afe1cc 100644
--- a/dom/interfaces/events/nsIDOMCustomEvent.idl
+++ b/dom/interfaces/events/nsIDOMCustomEvent.idl
@@ -38,7 +38,7 @@
 #include "nsIDOMEvent.idl"
 interface nsIVariant;
 
-[scriptable, uuid(e93f84c5-e72f-4429-b797-f0c28d87890f)]
+[scriptable, uuid(eee65f98-bb6f-489c-b7e3-40e5f0c90645)]
 interface nsIDOMCustomEvent : nsIDOMEvent
 {
 
diff --git a/dom/interfaces/events/nsIDOMDataContainerEvent.idl b/dom/interfaces/events/nsIDOMDataContainerEvent.idl
index 108b1e723f1..5cdfcd6f83c 100644
--- a/dom/interfaces/events/nsIDOMDataContainerEvent.idl
+++ b/dom/interfaces/events/nsIDOMDataContainerEvent.idl
@@ -39,7 +39,7 @@
 #include "nsIDOMEvent.idl"
 #include "nsIVariant.idl"
 
-[scriptable, uuid(3600d66c-b9ac-4c22-b39a-d64cce619921)]
+[scriptable, uuid(ac70e6bd-1f52-45ce-9d63-0aa650480ba1)]
 interface nsIDOMDataContainerEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl b/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
index e300578fe4f..736386028b5 100644
--- a/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
@@ -53,7 +53,7 @@ interface nsIDOMDeviceRotationRate : nsISupports
 };
 
 
-[scriptable, uuid(66E8D2C9-0826-444C-8FB8-E509BC9615F8)]
+[scriptable, uuid(b74dfd3f-0d16-4717-aaf7-8cadfe739532)]
 interface nsIDOMDeviceMotionEvent : nsIDOMEvent
 {
   void initDeviceMotionEvent(in DOMString eventTypeArg,
diff --git a/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl b/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
index 7192bdb2e29..3173b26fcf8 100644
--- a/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
@@ -36,7 +36,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, uuid(daf2d570-0ecc-4aa0-aba4-26f60dfcba6a)]
+[scriptable, uuid(a9bd91fd-c0a7-44ed-9975-5a58faba3be3)]
 interface nsIDOMDeviceOrientationEvent : nsIDOMEvent
 {
   void initDeviceOrientationEvent(in DOMString eventTypeArg,
diff --git a/dom/interfaces/events/nsIDOMDragEvent.idl b/dom/interfaces/events/nsIDOMDragEvent.idl
index d5dc7d5febd..d668d727408 100644
--- a/dom/interfaces/events/nsIDOMDragEvent.idl
+++ b/dom/interfaces/events/nsIDOMDragEvent.idl
@@ -40,7 +40,7 @@
 
 interface nsIDOMDataTransfer;
 
-[scriptable, uuid(26b40393-c383-4e9a-977f-e8e1351926eb)]
+[scriptable, uuid(74fb5f01-e473-4302-93f5-6f74bdaaddf2)]
 interface nsIDOMDragEvent : nsIDOMMouseEvent
 {
   readonly attribute nsIDOMDataTransfer dataTransfer;
diff --git a/dom/interfaces/events/nsIDOMEvent.idl b/dom/interfaces/events/nsIDOMEvent.idl
index b90af4cd950..3f892350fa4 100644
--- a/dom/interfaces/events/nsIDOMEvent.idl
+++ b/dom/interfaces/events/nsIDOMEvent.idl
@@ -49,7 +49,7 @@ interface nsIDOMEventTarget;
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, uuid(548137e8-fd2c-48c4-8635-3033f7db79e0)]
+[scriptable, uuid(e85cff74-951f-45c1-be0c-89442ea2f500)]
 interface nsIDOMEvent : nsISupports
 {
   // PhaseType
@@ -174,4 +174,10 @@ interface nsIDOMEvent : nsISupports
    * Used to indicate whether preventDefault() has been called for this event.
    */
   readonly attribute boolean defaultPrevented;
+
+  /**
+   * Prevents other event listeners from being triggered and,
+   * unlike Event.stopPropagation() its effect is immediate.
+   */
+  void                       stopImmediatePropagation();
 };
diff --git a/dom/interfaces/events/nsIDOMHashChangeEvent.idl b/dom/interfaces/events/nsIDOMHashChangeEvent.idl
index c13405bfc36..08990a7f9e0 100644
--- a/dom/interfaces/events/nsIDOMHashChangeEvent.idl
+++ b/dom/interfaces/events/nsIDOMHashChangeEvent.idl
@@ -34,7 +34,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, uuid(34850f11-8b88-43ce-8d55-9aa8b18753bd)]
+[scriptable, uuid(9fc4785c-b769-40e5-8f79-586e01413afd)]
 interface nsIDOMHashChangeEvent : nsIDOMEvent
 {
   readonly attribute DOMString oldURL;
diff --git a/dom/interfaces/events/nsIDOMKeyEvent.idl b/dom/interfaces/events/nsIDOMKeyEvent.idl
index fb7ef238506..d93023bfb9e 100644
--- a/dom/interfaces/events/nsIDOMKeyEvent.idl
+++ b/dom/interfaces/events/nsIDOMKeyEvent.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(ffcfb88a-d1d1-40b9-96e1-e338211d3511)]
+[scriptable, uuid(def974c3-b491-481b-bc67-29174af4b26a)]
 interface nsIDOMKeyEvent : nsIDOMUIEvent
 {
   const unsigned long DOM_VK_CANCEL         = 0x03;
diff --git a/dom/interfaces/events/nsIDOMMessageEvent.idl b/dom/interfaces/events/nsIDOMMessageEvent.idl
index 2981b864083..ce049fd9b93 100644
--- a/dom/interfaces/events/nsIDOMMessageEvent.idl
+++ b/dom/interfaces/events/nsIDOMMessageEvent.idl
@@ -45,7 +45,7 @@
  * For more information on this interface, please see
  * http://www.whatwg.org/specs/web-apps/current-work/#messageevent
  */
-[scriptable, uuid(9ac4fa26-4d19-4f4e-807e-b30cd0dbe56a)]
+[scriptable, uuid(3aca4a44-8e5f-4829-9d59-ce4adbba2b12)]
 interface nsIDOMMessageEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMMouseEvent.idl b/dom/interfaces/events/nsIDOMMouseEvent.idl
index c8768da78d0..3227d49523d 100644
--- a/dom/interfaces/events/nsIDOMMouseEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseEvent.idl
@@ -48,7 +48,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, uuid(7e6cb6e1-d3ba-4e60-a6ff-96350187a1e3)]
+[scriptable, uuid(7f57aa45-6792-4d8b-ba5b-201533cf0b2f)]
 interface nsIDOMMouseEvent : nsIDOMUIEvent
 {
   readonly attribute long               screenX;
diff --git a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
index ad3a003da36..52c80094e18 100644
--- a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMMouseEvent.idl"
 
-[scriptable, uuid(eac2ea89-7926-417a-bbc8-bb893e77bebb)]
+[scriptable, uuid(159f24b9-2058-40b9-b5bc-6477d192955a)]
 interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
 {
   const long HORIZONTAL_AXIS = 1;
diff --git a/dom/interfaces/events/nsIDOMMozTouchEvent.idl b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
index 2c9a650ff81..faa0a5035e6 100644
--- a/dom/interfaces/events/nsIDOMMozTouchEvent.idl
+++ b/dom/interfaces/events/nsIDOMMozTouchEvent.idl
@@ -40,7 +40,7 @@
 #include "nsIDOMMouseEvent.idl"
 
 
-[scriptable, uuid(e680bab6-740a-4097-b5e0-5e9d7d381cbc)]
+[scriptable, uuid(268da07b-4c41-4deb-96a2-10985644e6b0)]
 interface nsIDOMMozTouchEvent : nsIDOMMouseEvent
 {
   readonly attribute unsigned long streamId;
diff --git a/dom/interfaces/events/nsIDOMMutationEvent.idl b/dom/interfaces/events/nsIDOMMutationEvent.idl
index 7b122765c25..e5580f4ffc9 100644
--- a/dom/interfaces/events/nsIDOMMutationEvent.idl
+++ b/dom/interfaces/events/nsIDOMMutationEvent.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, uuid(8e440d86-886a-4e76-9e59-c13b939c9a4b)]
+[scriptable, uuid(72b3ddba-6cbb-4011-ac3b-50bd900b223d)]
 interface nsIDOMMutationEvent : nsIDOMEvent
 {
   const unsigned short      MODIFICATION       = 1;
diff --git a/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl b/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
index 0cbe9958fa3..185cab8e805 100644
--- a/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
+++ b/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
@@ -40,7 +40,7 @@
 #include "nsIDOMEvent.idl"
 #include "nsIVariant.idl"
 
-[scriptable, uuid(6250652d-7a6a-49a4-a2ee-9114e1e83427)]
+[scriptable, uuid(cd362d2f-a9a1-4127-940d-477ba0e82bd6)]
 interface nsIDOMNotifyAudioAvailableEvent : nsIDOMEvent
 {
   [implicit_jscontext]
diff --git a/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl b/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
index a90a85004b4..2f94cf276b6 100644
--- a/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
+++ b/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
@@ -45,7 +45,7 @@ interface nsIDOMPaintRequestList;
  * event, which fires at a window when painting has happened in
  * that window.
  */
-[scriptable, uuid(792e5779-7c39-4817-91a7-fdb3fba6428f)]
+[scriptable, uuid(5e9e91ad-8638-4e1c-bded-35b51b6df279)]
 interface nsIDOMNotifyPaintEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMPageTransitionEvent.idl b/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
index f457665cb9f..dbec8ce90ec 100644
--- a/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
+++ b/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
@@ -44,7 +44,7 @@
  * load/unload and saving/restoring a document from session history.
  */
 
-[scriptable, uuid(b712418b-376f-4f75-b156-5d9ad99fe51f)]
+[scriptable, uuid(3ca21c34-8391-4c5b-891e-0540a675dbf4)]
 interface nsIDOMPageTransitionEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMPopStateEvent.idl b/dom/interfaces/events/nsIDOMPopStateEvent.idl
index dc7de0db791..7237b47b15b 100644
--- a/dom/interfaces/events/nsIDOMPopStateEvent.idl
+++ b/dom/interfaces/events/nsIDOMPopStateEvent.idl
@@ -36,7 +36,7 @@
 
 interface nsIVariant;
 
-[scriptable, uuid(f3834fd5-0ef5-4ccd-a741-0b6685414342)]
+[scriptable, uuid(034f5fcc-9b41-433c-9795-64767051926a)]
 interface nsIDOMPopStateEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl b/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
index 2962f7eabde..c13f1af9a11 100644
--- a/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
+++ b/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
@@ -44,7 +44,7 @@ interface nsIURI;
  * posted when a popup window is blocked.
  */
 
-[scriptable, uuid(05be571f-c3ea-4959-a340-c57b1591ae4b)]
+[scriptable, uuid(853828af-eda7-459a-be7f-9011c20394ae)]
 interface nsIDOMPopupBlockedEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/events/nsIDOMProgressEvent.idl b/dom/interfaces/events/nsIDOMProgressEvent.idl
index c8b59e2ec4c..b37a210714f 100644
--- a/dom/interfaces/events/nsIDOMProgressEvent.idl
+++ b/dom/interfaces/events/nsIDOMProgressEvent.idl
@@ -45,7 +45,7 @@
  * the specification is complete and is compatible with the WebKit ProgressEvent.
  */
 
-[scriptable, uuid(6af7022c-d7f8-414c-a11f-a7918f14052b)]
+[scriptable, uuid(2377d8a6-9e27-4eb2-a377-9910772b33d3)]
 interface nsIDOMProgressEvent : nsIDOMEvent
 {
   readonly attribute boolean lengthComputable;
diff --git a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
index 6e788c0d5dd..fa5c0942cb5 100644
--- a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
+++ b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
@@ -37,7 +37,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(00028177-32a5-4ea3-b71d-8409beb15225)]
+[scriptable, uuid(a382424b-464f-475f-8880-f4ceaca9fde9)]
 interface nsIDOMScrollAreaEvent : nsIDOMUIEvent
 {
   // Scroll area client rect
diff --git a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
index 1c69af0ee32..3115e1096d3 100644
--- a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
+++ b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
@@ -97,7 +97,7 @@
  * consuming events.
  */
 
-[scriptable, uuid(0fdcef08-b4e8-4d41-91a0-4f5d259bfb81)]
+[scriptable, uuid(e9bdcc53-1bc0-4cae-9eb3-b215b6be7f70)]
 interface nsIDOMSimpleGestureEvent : nsIDOMMouseEvent
 {
   /* Swipe direction constants */
diff --git a/dom/interfaces/events/nsIDOMSmartCardEvent.idl b/dom/interfaces/events/nsIDOMSmartCardEvent.idl
index 4bd789dafd7..b0c203fa307 100644
--- a/dom/interfaces/events/nsIDOMSmartCardEvent.idl
+++ b/dom/interfaces/events/nsIDOMSmartCardEvent.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMEvent.idl"
 
-[scriptable, uuid(52bdc7ca-a934-4a40-a2e2-ac83a70b4019)]
+[scriptable, uuid(57e2dd86-3c70-4d9c-81d0-856d42e6bc7d)]
 interface nsIDOMSmartCardEvent : nsIDOMEvent
 {
   readonly attribute DOMString   tokenName;
diff --git a/dom/interfaces/events/nsIDOMTouchEvent.idl b/dom/interfaces/events/nsIDOMTouchEvent.idl
index 815f15add6f..66d84c4947b 100644
--- a/dom/interfaces/events/nsIDOMTouchEvent.idl
+++ b/dom/interfaces/events/nsIDOMTouchEvent.idl
@@ -65,7 +65,7 @@ interface nsIDOMTouchList : nsISupports {
   nsIDOMTouch identifiedTouch(in long identifier);
 };
 
-[scriptable, uuid(df94b20b-7998-4f00-935c-ee2c6b179711)]
+[scriptable, uuid(0cc687df-0ed5-4b7f-b89d-cbb99b21d23a)]
 interface nsIDOMTouchEvent : nsIDOMUIEvent {
   readonly attribute nsIDOMTouchList touches;
   readonly attribute nsIDOMTouchList targetTouches;
diff --git a/dom/interfaces/events/nsIDOMTransitionEvent.idl b/dom/interfaces/events/nsIDOMTransitionEvent.idl
index ffbdfcbc583..3588ceaf402 100644
--- a/dom/interfaces/events/nsIDOMTransitionEvent.idl
+++ b/dom/interfaces/events/nsIDOMTransitionEvent.idl
@@ -43,7 +43,7 @@
  * http://dev.w3.org/csswg/css3-transitions/#transition-events-
  */
 
-[scriptable, uuid(3e49ea4c-6f23-4aff-bd8f-e587edf514ec)]
+[scriptable, uuid(9ded6ca5-f5b2-4bf3-9250-e4f7808dc605)]
 interface nsIDOMTransitionEvent : nsIDOMEvent {
   readonly attribute DOMString           propertyName;
   readonly attribute float               elapsedTime;
diff --git a/dom/interfaces/events/nsIDOMUIEvent.idl b/dom/interfaces/events/nsIDOMUIEvent.idl
index 319acc0507b..ef5715bd215 100644
--- a/dom/interfaces/events/nsIDOMUIEvent.idl
+++ b/dom/interfaces/events/nsIDOMUIEvent.idl
@@ -47,7 +47,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Events/
  */
 
-[scriptable, uuid(4f3032d1-bdc5-4f37-bece-af8056d71c5c)]
+[scriptable, uuid(af3f130e-0c22-4613-a150-780a46c22e3a)]
 interface nsIDOMUIEvent : nsIDOMEvent
 {
   readonly attribute nsIDOMWindow       view;
diff --git a/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl b/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
index 4f8d6038c8d..198cd071711 100644
--- a/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
+++ b/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
@@ -40,7 +40,7 @@
 
 interface nsIDOMLSInput;
 
-[scriptable, uuid(b9a2371f-70e9-4657-b0e8-28e15b40857e)]
+[scriptable, uuid(89477959-7ce6-4f6f-9885-942e0a2c93cc)]
 interface nsIDOMLSProgressEvent : nsIDOMEvent
 {
   readonly attribute nsIDOMLSInput   input;
diff --git a/dom/interfaces/smil/nsIDOMTimeEvent.idl b/dom/interfaces/smil/nsIDOMTimeEvent.idl
index 086b7aebe23..96f21a4a34e 100644
--- a/dom/interfaces/smil/nsIDOMTimeEvent.idl
+++ b/dom/interfaces/smil/nsIDOMTimeEvent.idl
@@ -45,7 +45,7 @@
  * http://www.w3.org/TR/SVG/animate.html#InterfaceTimeEvent
  */
 
-[scriptable, uuid(873785cc-d8be-48af-8b30-5c566e3f4e6e)]
+[scriptable, uuid(5d7de21b-97c2-4a1d-a1f4-2ae527067660)]
 interface nsIDOMTimeEvent : nsIDOMEvent
 {
   readonly attribute long detail;
diff --git a/dom/interfaces/storage/nsIDOMStorageEvent.idl b/dom/interfaces/storage/nsIDOMStorageEvent.idl
index 25941ad5f53..f98da61b1e8 100644
--- a/dom/interfaces/storage/nsIDOMStorageEvent.idl
+++ b/dom/interfaces/storage/nsIDOMStorageEvent.idl
@@ -48,7 +48,7 @@
 
 interface nsIDOMStorage;
 
-[scriptable, uuid(AE0CB688-68B3-4fb3-9A11-2DA8E620E808)]
+[scriptable, uuid(501d7dc8-5b8b-4cce-99ad-16ed1046030a)]
 interface nsIDOMStorageEvent : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/storage/nsIDOMStorageEventObsolete.idl b/dom/interfaces/storage/nsIDOMStorageEventObsolete.idl
index 4bf94e7c1a0..7449696708b 100644
--- a/dom/interfaces/storage/nsIDOMStorageEventObsolete.idl
+++ b/dom/interfaces/storage/nsIDOMStorageEventObsolete.idl
@@ -46,7 +46,7 @@
  * Event sent to a window when a storage area changes.
  */
 
-[scriptable, uuid(c0178907-847d-41c0-8a62-31301bb946fa)]
+[scriptable, uuid(2b3b40fe-4734-4661-b7ff-dc555215db4e)]
 interface nsIDOMStorageEventObsolete : nsIDOMEvent
 {
   /**
diff --git a/dom/interfaces/svg/Makefile.in b/dom/interfaces/svg/Makefile.in
index c5d91f836c9..7e625ffd448 100644
--- a/dom/interfaces/svg/Makefile.in
+++ b/dom/interfaces/svg/Makefile.in
@@ -48,7 +48,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= dom
 XPIDL_MODULE	= dom_svg
 
-
 XPIDLSRCS	= \
 		nsIDOMGetSVGDocument.idl \
 		nsIDOMSVGAElement.idl \
@@ -66,6 +65,10 @@ XPIDLSRCS	= \
 		nsIDOMSVGAnimatedPoints.idl \
 		nsIDOMSVGAnimatedRect.idl \
 		nsIDOMSVGAnimatedString.idl \
+		nsIDOMSVGAnimateElement.idl \
+		nsIDOMSVGAnimateMotionElement.idl \
+		nsIDOMSVGAnimateTransformElement.idl \
+		nsIDOMSVGAnimationElement.idl \
 		nsIDOMSVGAnimPresAspRatio.idl \
 		nsIDOMSVGAnimTransformList.idl \
 		nsIDOMSVGCircleElement.idl \
@@ -92,6 +95,7 @@ XPIDLSRCS	= \
 		nsIDOMSVGMaskElement.idl \
 		nsIDOMSVGMatrix.idl \
 		nsIDOMSVGMetadataElement.idl \
+		nsIDOMSVGMpathElement.idl \
 		nsIDOMSVGNumber.idl \
 		nsIDOMSVGNumberList.idl \
 		nsIDOMSVGPathElement.idl \
@@ -106,6 +110,7 @@ XPIDLSRCS	= \
 		nsIDOMSVGRect.idl \
 		nsIDOMSVGRectElement.idl \
 		nsIDOMSVGScriptElement.idl \
+		nsIDOMSVGSetElement.idl \
 		nsIDOMSVGSVGElement.idl \
 		nsIDOMSVGStopElement.idl \
 		nsIDOMSVGStylable.idl \
@@ -129,15 +134,4 @@ XPIDLSRCS	= \
 		nsIDOMSVGZoomEvent.idl \
 		$(NULL)
 
-ifdef MOZ_SMIL
-XPIDLSRCS	+= \
-		nsIDOMSVGAnimateElement.idl \
-		nsIDOMSVGAnimateTransformElement.idl \
-		nsIDOMSVGAnimateMotionElement.idl \
-		nsIDOMSVGAnimationElement.idl \
-		nsIDOMSVGMpathElement.idl \
-		nsIDOMSVGSetElement.idl \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/interfaces/svg/nsIDOMSVGEvent.idl b/dom/interfaces/svg/nsIDOMSVGEvent.idl
index a2af30873d2..14ac3bca865 100644
--- a/dom/interfaces/svg/nsIDOMSVGEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGEvent.idl
@@ -42,7 +42,7 @@
  * http://www.w3.org/TR/SVG11/script.html#InterfaceSVGEvent
  */
 
-[scriptable, uuid(13aed1cc-a505-45d5-bbc2-0052c6bf200f)]
+[scriptable, uuid(40c55169-8b5e-456d-a58b-ee4518d93c40)]
 interface nsIDOMSVGEvent : nsIDOMEvent
 {
 };
diff --git a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
index f3bce6223f8..c87f7afb6a2 100644
--- a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
@@ -45,7 +45,7 @@
 interface nsIDOMSVGRect;
 interface nsIDOMSVGPoint;
 
-[scriptable, uuid(91f381f0-65ba-4392-bbf9-381fda450d76)]
+[scriptable, uuid(85ba3378-83eb-4d26-8917-c5c73c705669)]
 interface nsIDOMSVGZoomEvent : nsIDOMUIEvent
 {
   readonly attribute nsIDOMSVGRect  zoomRectScreen;
diff --git a/dom/interfaces/threads/nsIDOMWorkers.idl b/dom/interfaces/threads/nsIDOMWorkers.idl
index a30f0a24b87..e406713e8b6 100644
--- a/dom/interfaces/threads/nsIDOMWorkers.idl
+++ b/dom/interfaces/threads/nsIDOMWorkers.idl
@@ -51,7 +51,7 @@ interface nsIWorkerMessagePort : nsISupports
   void postMessage(/* in JSObject aMessage */);
 };
 
-[scriptable, uuid(508f2d49-e9a0-4fe8-bd33-321820173b4a)]
+[scriptable, uuid(c013e89d-467e-4e77-b011-d00da5c1d957)]
 interface nsIWorkerMessageEvent : nsIDOMEvent
 {
   readonly attribute DOMString data;
@@ -67,7 +67,7 @@ interface nsIWorkerMessageEvent : nsIDOMEvent
                         in nsISupports aSourceArg);
 };
 
-[scriptable, uuid(73d82c1d-05de-49c9-a23b-7121ff09a67a)]
+[scriptable, uuid(963b856d-61b8-4c4d-bd6e-7bb3664a2993)]
 interface nsIWorkerErrorEvent : nsIDOMEvent
 {
   readonly attribute DOMString message;
diff --git a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
index 130414def56..bda620cd5e2 100644
--- a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
+++ b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
@@ -43,7 +43,7 @@
 
 #include "nsIDOMUIEvent.idl"
 
-[scriptable, uuid(da4922ca-6dbc-4df6-8187-91f3a71eb48f)]
+[scriptable, uuid(980999ae-7702-4c8f-944d-77db4e99583c)]
 interface nsIDOMXULCommandEvent : nsIDOMUIEvent
 {
   /**
diff --git a/dom/locales/en-US/chrome/layout/htmlparser.properties b/dom/locales/en-US/chrome/layout/htmlparser.properties
index be806aeb62f..9b5d317b958 100644
--- a/dom/locales/en-US/chrome/layout/htmlparser.properties
+++ b/dom/locales/en-US/chrome/layout/htmlparser.properties
@@ -40,43 +40,42 @@
 # which is available under the MIT license.
 
 # Tokenizer errors
-errGarbageAfterLtSlash=Garbage after \u201C</\u201D.
-errLtSlashGt=Saw \u201C</>\u201D. Probable causes: Unescaped \u201C<\u201D (escape as \u201C&lt;\u201D) or mistyped end tag.
+errGarbageAfterLtSlash=Garbage after “</”.
+errLtSlashGt=Saw “</>”. Probable causes: Unescaped “<” (escape as “&lt;”) or mistyped end tag.
 errCharRefLacksSemicolon=Character reference was not terminated by a semicolon.
 errNoDigitsInNCR=No digits in numeric character reference.
-errGtInSystemId=\u201C>\u201D in system identifier.
-errGtInPublicId=\u201C>\u201D in public identifier.
+errGtInSystemId=“>” in system identifier.
+errGtInPublicId=“>” in public identifier.
 errNamelessDoctype=Nameless doctype.
-errConsecutiveHyphens=Consecutive hyphens did not terminate a comment. \u201C--\u201D is not permitted inside a comment, but e.g. \u201C- -\u201D is.
-errPrematureEndOfComment=Premature end of comment. Use \u201C-->\u201D to end a comment properly.
+errConsecutiveHyphens=Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
+errPrematureEndOfComment=Premature end of comment. Use “-->” to end a comment properly.
 errBogusComment=Bogus comment.
-errUnquotedAttributeLt=\u201C<\u201D in an unquoted attribute value. Probable cause: Missing \u201C>\u201D immediately before.
-errUnquotedAttributeGrave=\u201C`\u201D in an unquoted attribute value. Probable cause: Using the wrong character as a quote.
+errUnquotedAttributeLt=“<” in an unquoted attribute value. Probable cause: Missing “>” immediately before.
+errUnquotedAttributeGrave=“`” in an unquoted attribute value. Probable cause: Using the wrong character as a quote.
 errUnquotedAttributeQuote=Quote in an unquoted attribute value. Probable causes: Attributes running together or a URL query string in an unquoted attribute value.
-errUnquotedAttributeEquals=\u201C=\u201D in an unquoted attribute value. Probable causes: Attributes running together or a URL query string in an unquoted attribute value.
-errSlashNotFollowedByGt=A slash was not immediate followed by \u201C>\u201D.
+errUnquotedAttributeEquals=“=” in an unquoted attribute value. Probable causes: Attributes running together or a URL query string in an unquoted attribute value.
+errSlashNotFollowedByGt=A slash was not immediate followed by “>”.
 errNoSpaceBetweenAttributes=No space between attributes.
-errUnquotedAttributeStartLt=\u201C<\u201D at the start of an unquoted attribute value. Probable cause: Missing \u201C>\u201D immediately before
-errUnquotedAttributeStartGrave=\u201C`\u201D at the start of an unquoted attribute value. Probable cause: Using the wrong character as a quote.
-errUnquotedAttributeStartEquals=\u201C=\u201D at the start of an unquoted attribute value. Probable cause: Stray duplicate equals sign.
+errUnquotedAttributeStartLt=“<” at the start of an unquoted attribute value. Probable cause: Missing “>” immediately before
+errUnquotedAttributeStartGrave=“`” at the start of an unquoted attribute value. Probable cause: Using the wrong character as a quote.
+errUnquotedAttributeStartEquals=“=” at the start of an unquoted attribute value. Probable cause: Stray duplicate equals sign.
 errAttributeValueMissing=Attribute value missing.
-errBadCharBeforeAttributeNameLt=Saw \u201C<\u201D when expecting an attribute name. Probable cause: Missing \u201C>\u201D immediately before.
-errEqualsSignBeforeAttributeName=Saw \u201C=\u201D when expecting an attribute name. Probable cause: Attribute name missing.
-errBadCharAfterLt=Bad character after \u201C<\u201D. Probable cause: Unescaped \u201C<\u201D. Try escaping it as \u201C&lt;\u201D.
-errLtGt=Saw \u201C<>\u201D. Probable causes: Unescaped \u201C<\u201D (escape as \u201C&lt;\u201D) or mistyped start tag.
-errProcessingInstruction=Saw \u201C<?\u201D. Probable cause: Attempt to use an XML processing instruction in HTML. (XML processing instructions are not supported in HTML.)
-errUnescapedAmpersandInterpretedAsCharacterReference=The string following \u201C&\u201D was interpreted as a character reference. (\u201C&\u201D probably should have been escaped as \u201C&amp;\u201D.)
-errNotSemicolonTerminated=Named character reference was not terminated by a semicolon. (Or \u201C&\u201D should have been escaped as \u201C&amp;\u201D.)
-errNoNamedCharacterMatch=\u201C&\u201D did not start a character reference. (\u201C&\u201D probably should have been escaped as \u201C&amp;\u201D.)
-errQuoteBeforeAttributeName=Saw a quote when expecting an attribute name. Probable cause: \u201C=\u201D missing immediately before.
-errLtInAttributeName=\u201C<\u201D in attribute name. Probable cause: \u201C>\u201D missing immediately before.
+errBadCharBeforeAttributeNameLt=Saw “<” when expecting an attribute name. Probable cause: Missing “>” immediately before.
+errEqualsSignBeforeAttributeName=Saw “=” when expecting an attribute name. Probable cause: Attribute name missing.
+errBadCharAfterLt=Bad character after “<”. Probable cause: Unescaped “<”. Try escaping it as “&lt;”.
+errLtGt=Saw “<>”. Probable causes: Unescaped “<” (escape as “&lt;”) or mistyped start tag.
+errProcessingInstruction=Saw “<?”. Probable cause: Attempt to use an XML processing instruction in HTML. (XML processing instructions are not supported in HTML.)
+errUnescapedAmpersandInterpretedAsCharacterReference=The string following “&” was interpreted as a character reference. (“&” probably should have been escaped as “&amp;”.)
+errNotSemicolonTerminated=Named character reference was not terminated by a semicolon. (Or “&” should have been escaped as “&amp;”.)
+errNoNamedCharacterMatch=“&” did not start a character reference. (“&” probably should have been escaped as “&amp;”.)
+errQuoteBeforeAttributeName=Saw a quote when expecting an attribute name. Probable cause: “=” missing immediately before.
+errLtInAttributeName=“<” in attribute name. Probable cause: “>” missing immediately before.
 errQuoteInAttributeName=Quote in attribute name. Probable cause: Matching quote missing somewhere earlier.
 errExpectedPublicId=Expected a public identifier but the doctype ended.
 errBogusDoctype=Bogus doctype.
 maybeErrAttributesOnEndTag=End tag had attributes.
-maybeErrSlashInEndTag=Stray \u201C/\u201D at the end of an end tag.
+maybeErrSlashInEndTag=Stray “/” at the end of an end tag.
 errNcrNonCharacter=Character reference expands to a non-character.
-errAstralNonCharacter=Character reference expands to an astral non-character.
 errNcrSurrogate=Character reference expands to a surrogate.
 errNcrControlChar=Character reference expands to a control character.
 errNcrCr=A numeric character reference expanded to carriage return.
@@ -86,67 +85,66 @@ errEofInComment=End of file inside comment.
 errEofInDoctype=End of file inside doctype.
 errEofInAttributeValue=End of file reached when inside an attribute value. Ignoring tag.
 errEofInAttributeName=End of file occurred in an attribute name. Ignoring tag.
-errEofWithoutGt=Saw end of file without the previous tag ending with \u201C>\u201D. Ignoring tag.
+errEofWithoutGt=Saw end of file without the previous tag ending with “>”. Ignoring tag.
 errEofInTagName=End of file seen when looking for tag name. Ignoring tag.
 errEofInEndTag=End of file inside end tag. Ignoring tag.
-errEofAfterLt=End of file after \u201C<\u201D.
+errEofAfterLt=End of file after “<”.
 errNcrOutOfRange=Character reference outside the permissible Unicode range.
 errNcrUnassigned=Character reference expands to a permanently unassigned code point.
 errDuplicateAttribute=Duplicate attribute.
 errEofInSystemId=End of file inside system identifier.
 errExpectedSystemId=Expected a system identifier but the doctype ended.
 errMissingSpaceBeforeDoctypeName=Missing space before doctype name.
-errHyphenHyphenBang=\u201C--!\u201D found in comment.
-errNcrControlChar=Character reference expands to a control character.
+errHyphenHyphenBang=“--!” found in comment.
 errNcrZero=Character reference expands to zero.
-errNoSpaceBetweenDoctypeSystemKeywordAndQuote=No space between the doctype \u201CSYSTEM\u201D keyword and the quote.
+errNoSpaceBetweenDoctypeSystemKeywordAndQuote=No space between the doctype “SYSTEM” keyword and the quote.
 errNoSpaceBetweenPublicAndSystemIds=No space between the doctype public and system identifiers.
-errNoSpaceBetweenDoctypePublicKeywordAndQuote=No space between the doctype \u201CPUBLIC\u201D keyword and the quote.
+errNoSpaceBetweenDoctypePublicKeywordAndQuote=No space between the doctype “PUBLIC” keyword and the quote.
 
 # Tree builder errors
-errStrayStartTag=Stray start tag \u201C%1$S\u201D.
-errStrayEndTag=Stray end tag \u201C%1$S\u201D.
-errUnclosedElements=End tag \u201C%1$S\u201D seen, but there were open elements.
-errUnclosedElementsImplied=End tag \u201C%1$S\u201D implied, but there were open elements.
+errStrayStartTag2=Stray start tag “%1$S”.
+errStrayEndTag=Stray end tag “%1$S”.
+errUnclosedElements=End tag “%1$S” seen, but there were open elements.
+errUnclosedElementsImplied=End tag “%1$S” implied, but there were open elements.
 errUnclosedElementsCell=A table cell was implicitly closed, but there were open elements.
 errStrayDoctype=Stray doctype.
-errAlmostStandardsDoctype=Almost standards mode doctype. Expected \u201C<!DOCTYPE html>\u201D.
-errQuirkyDoctype=Quirky doctype. Expected \u201C<!DOCTYPE html>\u201D.
+errAlmostStandardsDoctype=Almost standards mode doctype. Expected “<!DOCTYPE html>”.
+errQuirkyDoctype=Quirky doctype. Expected “<!DOCTYPE html>”.
 errNonSpaceInTrailer=Non-space character in page trailer.
-errNonSpaceAfterFrameset=Non-space after \u201Cframeset\u201D.
-errNonSpaceInFrameset=Non-space in \u201Cframeset\u201D.
+errNonSpaceAfterFrameset=Non-space after “frameset”.
+errNonSpaceInFrameset=Non-space in “frameset”.
 errNonSpaceAfterBody=Non-space character after body.
-errNonSpaceInColgroupInFragment=Non-space in \u201Ccolgroup\u201D when parsing fragment.
-errNonSpaceInNoscriptInHead=Non-space character inside \u201Cnoscript\u201D inside \u201Chead\u201D.
-errFooBetweenHeadAndBody=\u201C%1$S\u201D element between \u201Chead\u201D and \u201Cbody\u201D.
-errStartTagWithoutDoctype=Start tag seen without seeing a doctype first. Expected \u201C<!DOCTYPE html>\u201D.
-errNoSelectInTableScope=No \u201Cselect\u201D in table scope.
-errStartSelectWhereEndSelectExpected=\u201Cselect\u201D start tag where end tag expected.
-errStartTagWithSelectOpen=\u201C%1$S\u201D start tag with \u201Cselect\u201D open.
-errBadStartTagInHead=Bad start tag in \u201C%1$S\u201D in \u201Chead\u201D.
-errImage=Saw a start tag \u201Cimage\u201D.
-errIsindex=\u201Cisindex\u201D seen.
-errFooSeenWhenFooOpen=An \u201C%1$S\u201D start tag seen but an element of the same type was already open.
+errNonSpaceInColgroupInFragment=Non-space in “colgroup” when parsing fragment.
+errNonSpaceInNoscriptInHead=Non-space character inside “noscript” inside “head”.
+errFooBetweenHeadAndBody=“%1$S” element between “head” and “body”.
+errStartTagWithoutDoctype=Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+errNoSelectInTableScope=No “select” in table scope.
+errStartSelectWhereEndSelectExpected=“select” start tag where end tag expected.
+errStartTagWithSelectOpen=“%1$S” start tag with “select” open.
+errBadStartTagInHead2=Bad start tag “%1$S” in “head”.
+errImage=Saw a start tag “image”.
+errIsindex=“isindex” seen.
+errFooSeenWhenFooOpen=An “%1$S” start tag seen but an element of the same type was already open.
 errHeadingWhenHeadingOpen=Heading cannot be a child of another heading.
-errFramesetStart=\u201Cframeset\u201D start tag seen.
+errFramesetStart=“frameset” start tag seen.
 errNoCellToClose=No cell to close.
-errStartTagInTable=Start tag \u201C%1$S\u201D seen in \u201Ctable\u201D.
-errFormWhenFormOpen=Saw a \u201Cform\u201D start tag, but there was already an active \u201Cform\u201D element. Nested forms are not allowed. Ignoring the tag.
-errTableSeenWhileTableOpen=Start tag for \u201Ctable\u201D seen but the previous \u201Ctable\u201D is still open.
-errStartTagInTableBody=\u201C%1$S\u201D start tag in table body.
-errEndTagSeenWithoutDoctype=End tag seen without seeing a doctype first. Expected \u201C<!DOCTYPE html>\u201D.
-errEndTagAfterBody=Saw an end tag after \u201Cbody\u201D had been closed.
-errEndTagSeenWithSelectOpen=\u201C%1$S\u201D end tag with \u201Cselect\u201D open.
-errGarbageInColgroup=Garbage in \u201Ccolgroup\u201D fragment.
-errEndTagBr=End tag \u201Cbr\u201D.
-errNoElementToCloseButEndTagSeen=No \u201C%1$S\u201D element in scope but a \u201C%1$S\u201D end tag seen.
-errHtmlStartTagInForeignContext=HTML start tag \u201C%1$S\u201D in a foreign namespace context.
-errTableClosedWhileCaptionOpen=\u201Ctable\u201D closed but \u201Ccaption\u201D was still open.
+errStartTagInTable=Start tag “%1$S” seen in “table”.
+errFormWhenFormOpen=Saw a “form” start tag, but there was already an active “form” element. Nested forms are not allowed. Ignoring the tag.
+errTableSeenWhileTableOpen=Start tag for “table” seen but the previous “table” is still open.
+errStartTagInTableBody=“%1$S” start tag in table body.
+errEndTagSeenWithoutDoctype=End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
+errEndTagAfterBody=Saw an end tag after “body” had been closed.
+errEndTagSeenWithSelectOpen=“%1$S” end tag with “select” open.
+errGarbageInColgroup=Garbage in “colgroup” fragment.
+errEndTagBr=End tag “br”.
+errNoElementToCloseButEndTagSeen=No “%1$S” element in scope but a “%1$S” end tag seen.
+errHtmlStartTagInForeignContext=HTML start tag “%1$S” in a foreign namespace context.
+errTableClosedWhileCaptionOpen=“table” closed but “caption” was still open.
 errNoTableRowToClose=No table row to close.
 errNonSpaceInTable=Misplaced non-space characters inside a table.
-errUnclosedChildrenInRuby=Unclosed children in \u201Cruby\u201D.
-errStartTagSeenWithoutRuby=Start tag \u201C%1$S\u201D seen without a \u201Cruby\u201D element being open.
-errSelfClosing=Self-closing syntax (\u201C/>\u201D) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
+errUnclosedChildrenInRuby=Unclosed children in “ruby”.
+errStartTagSeenWithoutRuby=Start tag “%1$S” seen without a “ruby” element being open.
+errSelfClosing=Self-closing syntax (“/>”) used on a non-void HTML element. Ignoring the slash and treating as a start tag.
 errNoCheckUnclosedElementsOnStack=Unclosed elements on stack.
-errEndTagDidNotMatchCurrentOpenElement=End tag \u201C%1$S\u201D did not match the name of the current open element (\u201C%2$S\u201D).
-errEndTagViolatesNestingRules=End tag \u201C%1$S\u201D violates nesting rules.
+errEndTagDidNotMatchCurrentOpenElement=End tag “%1$S” did not match the name of the current open element (“%2$S”).
+errEndTagViolatesNestingRules=End tag “%1$S” violates nesting rules.
diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
index 40904555dc4..f5b29aa45e8 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -556,11 +556,16 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request,
     
     if (responseCode > 206) { // not normal
       bool bWantsAllNetworkStreams = false;
-      rv = mPluginInstance->GetValueFromPlugin(NPPVpluginWantsAllNetworkStreams,
-                                               &bWantsAllNetworkStreams);
-      // If the call returned an error code make sure we still use our default value.
-      if (NS_FAILED(rv)) {
-        bWantsAllNetworkStreams = false;
+
+      // We don't always have an instance here already, but if we do, check
+      // to see if it wants all streams.
+      if (mPluginInstance) {
+        rv = mPluginInstance->GetValueFromPlugin(NPPVpluginWantsAllNetworkStreams,
+                                                 &bWantsAllNetworkStreams);
+        // If the call returned an error code make sure we still use our default value.
+        if (NS_FAILED(rv)) {
+          bWantsAllNetworkStreams = false;
+        }
       }
 
       if (!bWantsAllNetworkStreams) {
diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp
index 0ad2a3fd359..9de9633ec36 100644
--- a/dom/src/storage/nsDOMStorage.cpp
+++ b/dom/src/storage/nsDOMStorage.cpp
@@ -74,6 +74,12 @@ using mozilla::dom::StorageChild;
 #include "mozilla/Preferences.h"
 #include "nsThreadUtils.h"
 
+// calls FlushAndDeleteTemporaryTables(false)
+#define NS_DOMSTORAGE_FLUSH_TIMER_TOPIC "domstorage-flush-timer"
+
+// calls FlushAndDeleteTemporaryTables(true)
+#define NS_DOMSTORAGE_FLUSH_FORCE_TOPIC "domstorage-flush-force"
+
 using namespace mozilla;
 
 static const PRUint32 ASK_BEFORE_ACCEPT = 1;
@@ -290,7 +296,7 @@ nsDOMStorageManager::Initialize()
   // Used for temporary table flushing
   os->AddObserver(gStorageManager, "profile-before-change", false);
   os->AddObserver(gStorageManager, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
-  os->AddObserver(gStorageManager, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, false);
+  os->AddObserver(gStorageManager, NS_DOMSTORAGE_FLUSH_TIMER_TOPIC, false);
 
   return NS_OK;
 }
@@ -440,7 +446,7 @@ nsDOMStorageManager::Observe(nsISupports *aSubject,
   } else if (!strcmp(aTopic, "timer-callback")) {
     nsCOMPtr<nsIObserverService> obsserv = mozilla::services::GetObserverService();
     if (obsserv)
-      obsserv->NotifyObservers(nsnull, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER, nsnull);
+      obsserv->NotifyObservers(nsnull, NS_DOMSTORAGE_FLUSH_TIMER_TOPIC, nsnull);
   } else if (!strcmp(aTopic, "browser:purge-domain-data")) {
     // Convert the domain name to the ACE format
     nsCAutoString aceDomain;
@@ -475,13 +481,20 @@ nsDOMStorageManager::Observe(nsISupports *aSubject,
       NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
                        "DOMStorage: temporary table commit failed");
     }
-  } else if (!strcmp(aTopic, NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER)) {
+  } else if (!strcmp(aTopic, NS_DOMSTORAGE_FLUSH_TIMER_TOPIC)) {
     if (DOMStorageImpl::gStorageDB) {
       DebugOnly<nsresult> rv =
         DOMStorageImpl::gStorageDB->FlushAndDeleteTemporaryTables(false);
       NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
                        "DOMStorage: temporary table commit failed");
     }
+  } else if (!strcmp(aTopic, NS_DOMSTORAGE_FLUSH_FORCE_TOPIC)) {
+    if (DOMStorageImpl::gStorageDB) {
+      DebugOnly<nsresult> rv =
+        DOMStorageImpl::gStorageDB->FlushAndDeleteTemporaryTables(true);
+      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv),
+                       "DOMStorage: temporary table commit failed");
+    }
   }
 
   return NS_OK;
diff --git a/dom/src/storage/nsDOMStorage.h b/dom/src/storage/nsDOMStorage.h
index da9ac08ff04..737cc00fc0d 100644
--- a/dom/src/storage/nsDOMStorage.h
+++ b/dom/src/storage/nsDOMStorage.h
@@ -62,8 +62,6 @@
 #include "nsITimer.h"
 #include "nsWeakReference.h"
 
-#define NS_DOMSTORAGE_FLUSH_TIMER_OBSERVER "domstorage-flush-timer"
-
 #include "nsDOMStorageDBWrapper.h"
 
 #define IS_PERMISSION_ALLOWED(perm) \
diff --git a/dom/tests/browser/browser_ConsoleAPITests.js b/dom/tests/browser/browser_ConsoleAPITests.js
index eee1f467270..f3e4e7ed653 100644
--- a/dom/tests/browser/browser_ConsoleAPITests.js
+++ b/dom/tests/browser/browser_ConsoleAPITests.js
@@ -124,7 +124,7 @@ function startGroupTest() {
   };
   let button = gWindow.document.getElementById("test-groups");
   ok(button, "found #test-groups button");
-  EventUtils.synthesizeMouse(button, 2, 2, {}, gWindow);
+  EventUtils.synthesizeMouseAtCenter(button, {}, gWindow);
 }
 
 function testConsoleGroup(aMessageObject) {
@@ -137,7 +137,7 @@ function testConsoleGroup(aMessageObject) {
      "expected level received");
 
   is(aMessageObject.functionName, "testGroups", "functionName matches");
-  ok(aMessageObject.lineNumber >= 32 && aMessageObject.lineNumber <= 34,
+  ok(aMessageObject.lineNumber >= 45 && aMessageObject.lineNumber <= 47,
      "lineNumber matches");
   if (aMessageObject.level == "groupCollapsed") {
     ok(aMessageObject.arguments == "a group", "groupCollapsed arguments matches");
@@ -150,9 +150,7 @@ function testConsoleGroup(aMessageObject) {
   }
 
   if (aMessageObject.level == "groupEnd") {
-    // Test finished
-    ConsoleObserver.destroy();
-    finish();
+    startTimeTest();
   }
 }
 
@@ -167,7 +165,7 @@ function startTraceTest() {
 
   let button = gWindow.document.getElementById("test-trace");
   ok(button, "found #test-trace button");
-  EventUtils.synthesizeMouse(button, 2, 2, {}, gWindow);
+  EventUtils.synthesizeMouseAtCenter(button, {}, gWindow);
 }
 
 function startLocationTest() {
@@ -188,7 +186,7 @@ function startLocationTest() {
 
   let button = gWindow.document.getElementById("test-location");
   ok(button, "found #test-location button");
-  EventUtils.synthesizeMouse(button, 2, 2, {}, gWindow);
+  EventUtils.synthesizeMouseAtCenter(button, {}, gWindow);
 }
 
 function expect(level) {
@@ -250,6 +248,114 @@ function consoleAPISanityTest() {
   ok(win.console.group, "console.group is here");
   ok(win.console.groupCollapsed, "console.groupCollapsed is here");
   ok(win.console.groupEnd, "console.groupEnd is here");
+  ok(win.console.time, "console.time is here");
+  ok(win.console.timeEnd, "console.timeEnd is here");
+}
+
+function startTimeTest() {
+  // Reset the observer function to cope with the fabricated test data.
+  ConsoleObserver.observe = function CO_observe(aSubject, aTopic, aData) {
+    try {
+      testConsoleTime(aSubject.wrappedJSObject);
+    } catch (ex) {
+      // XXX Exceptions in this function currently aren't reported, because of
+      // some XPConnect weirdness, so report them manually
+      ok(false, "Exception thrown in CO_observe: " + ex);
+    }
+  };
+  gLevel = "time";
+  gArgs = [
+    {filename: TEST_URI, lineNumber: 23, functionName: "startTimer"},
+  ];
+
+  let button = gWindow.document.getElementById("test-time");
+  ok(button, "found #test-time button");
+  EventUtils.synthesizeMouseAtCenter(button, {}, gWindow);
+}
+
+function testConsoleTime(aMessageObject) {
+  let messageWindow = getWindowByWindowId(aMessageObject.ID);
+  is(messageWindow, gWindow, "found correct window by window ID");
+
+  is(aMessageObject.level, gLevel, "expected level received");
+
+  is(aMessageObject.filename, gArgs[0].filename, "filename matches");
+  is(aMessageObject.lineNumber, gArgs[0].lineNumber, "lineNumber matches");
+  is(aMessageObject.functionName, gArgs[0].functionName, "functionName matches");
+
+  startTimeEndTest();
+}
+
+function startTimeEndTest() {
+  // Reset the observer function to cope with the fabricated test data.
+  ConsoleObserver.observe = function CO_observe(aSubject, aTopic, aData) {
+    try {
+      testConsoleTimeEnd(aSubject.wrappedJSObject);
+    } catch (ex) {
+      // XXX Exceptions in this function currently aren't reported, because of
+      // some XPConnect weirdness, so report them manually
+      ok(false, "Exception thrown in CO_observe: " + ex);
+    }
+  };
+  gLevel = "timeEnd";
+  gArgs = [
+    {filename: TEST_URI, lineNumber: 27, functionName: "stopTimer", arguments: { name: "foo" }},
+  ];
+
+  let button = gWindow.document.getElementById("test-timeEnd");
+  ok(button, "found #test-timeEnd button");
+  EventUtils.synthesizeMouseAtCenter(button, {}, gWindow);
+}
+
+function testConsoleTimeEnd(aMessageObject) {
+  let messageWindow = getWindowByWindowId(aMessageObject.ID);
+  is(messageWindow, gWindow, "found correct window by window ID");
+
+  is(aMessageObject.level, gLevel, "expected level received");
+  ok(aMessageObject.arguments, "we have arguments");
+
+  is(aMessageObject.filename, gArgs[0].filename, "filename matches");
+  is(aMessageObject.lineNumber, gArgs[0].lineNumber, "lineNumber matches");
+  is(aMessageObject.functionName, gArgs[0].functionName, "functionName matches");
+  is(aMessageObject.arguments.length, gArgs[0].arguments.length, "arguments.length matches");
+  is(aMessageObject.arguments.name, gArgs[0].arguments.name, "timer name matches");
+  ok(typeof aMessageObject.arguments.duration == "number", "timer duration is a number");
+  ok(aMessageObject.arguments.duration > 0, "timer duration is positive");
+
+  startEmptyTimerTest();
+}
+
+function startEmptyTimerTest() {
+  // Reset the observer function to cope with the fabricated test data.
+  ConsoleObserver.observe = function CO_observe(aSubject, aTopic, aData) {
+    try {
+      testEmptyTimer(aSubject.wrappedJSObject);
+    } catch (ex) {
+      // XXX Exceptions in this function currently aren't reported, because of
+      // some XPConnect weirdness, so report them manually
+      ok(false, "Exception thrown in CO_observe: " + ex);
+    }
+  };
+
+  let button = gWindow.document.getElementById("test-namelessTimer");
+  ok(button, "found #test-namelessTimer button");
+  EventUtils.synthesizeMouseAtCenter(button, {}, gWindow);
+}
+
+function testEmptyTimer(aMessageObject) {
+  let messageWindow = getWindowByWindowId(aMessageObject.ID);
+  is(messageWindow, gWindow, "found correct window by window ID");
+
+  ok(aMessageObject.level == "time" || aMessageObject.level == "timeEnd",
+     "expected level received");
+  ok(!aMessageObject.arguments, "we don't have arguments");
+
+  is(aMessageObject.functionName, "namelessTimer", "functionName matches");
+  ok(aMessageObject.lineNumber == 31 || aMessageObject.lineNumber == 32,
+     "lineNumber matches");
+  // Test finished
+  ConsoleObserver.destroy();
+  finish();
 }
 
 var ConsoleObserver = {
diff --git a/dom/tests/browser/test-console-api.html b/dom/tests/browser/test-console-api.html
index 96066ae2477..a31429d68be 100644
--- a/dom/tests/browser/test-console-api.html
+++ b/dom/tests/browser/test-console-api.html
@@ -19,6 +19,19 @@
         console.log(omg, "o", "d");
       }
 
+      function startTimer(timer) {
+        console.time(timer);
+      }
+
+      function stopTimer(timer) {
+        console.timeEnd(timer);
+      }
+
+      function namelessTimer() {
+        console.time();
+        console.timeEnd();
+      }
+
       function test() {
         var str = "Test Message."
         console.foobar(str); // if this throws, we don't execute following funcs
@@ -41,5 +54,8 @@
     <button id="test-trace" onclick="foobar585956a('omg');">Test trace</button>
     <button id="test-location" onclick="foobar646025('omg');">Test location</button>
     <button id="test-groups" onclick="testGroups();">Test groups</button>
+    <button id="test-time" onclick="startTimer('foo');">Test time</button>
+    <button id="test-timeEnd" onclick="stopTimer('foo');">Test timeEnd</button>
+    <button id="test-namelessTimer" onclick="namelessTimer();">Test namelessTimer</button>
   </body>
 </html>
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index 6f39e72957e..62eaf858add 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -144,6 +144,7 @@ _TEST_FILES	= \
 		test_bug648465.html \
 		test_bug654137.html \
 		test_bug684544.html \
+		test_bug698551.html \
 		test_window_bar.html \
 		file_window_bar.html \
 		test_resize_move_windows.html \
diff --git a/dom/tests/mochitest/bugs/test_bug698551.html b/dom/tests/mochitest/bugs/test_bug698551.html
new file mode 100644
index 00000000000..70a002bb97b
--- /dev/null
+++ b/dom/tests/mochitest/bugs/test_bug698551.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=698551
+-->
+<head>
+  <title>Test for Bug 698551</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=698551">Mozilla Bug 698551</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 698551 **/
+var l = document.getElementsByTagName("body");
+var it = Object.getPrototypeOf(l).item;
+Object.defineProperty(Object.getPrototypeOf(l), "item",
+{
+  get: function() { return it; },
+});
+Object.defineProperty(Object.getPrototypeOf(l), "foopy",
+{
+  get: function() { return this[0]; },
+});
+is(l.foopy, document.body,
+   "Should end up with the body correctly when getting via [0]");
+is(l.item(0), document.body,
+   "Should end up with the body correctly when getting via .item(0)");
+is(l.length, 1, "Should have one body");
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/tests/mochitest/general/test_consoleAPI.html b/dom/tests/mochitest/general/test_consoleAPI.html
index a82ede0d7c2..21aa9cb1f1d 100644
--- a/dom/tests/mochitest/general/test_consoleAPI.html
+++ b/dom/tests/mochitest/general/test_consoleAPI.html
@@ -30,6 +30,8 @@ function doTest() {
     "group": "function",
     "groupCollapsed": "function",
     "groupEnd": "function",
+    "time": "function",
+    "timeEnd": "function",
     "__noSuchMethod__": "function"
   };
 
diff --git a/dom/tests/mochitest/localstorage/test_bug624047.html b/dom/tests/mochitest/localstorage/test_bug624047.html
index c81eff272e7..c071fd58b48 100644
--- a/dom/tests/mochitest/localstorage/test_bug624047.html
+++ b/dom/tests/mochitest/localstorage/test_bug624047.html
@@ -24,7 +24,7 @@ function flushTables()
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var storageManager = Components.classes["@mozilla.org/dom/storagemanager;1"]
     .getService(Components.interfaces.nsIObserver);
-  storageManager.observe(null, "profile-before-change", null);
+  storageManager.observe(null, "domstorage-flush-force", null);
 }
 
 function startTest()
diff --git a/dom/workers/Events.cpp b/dom/workers/Events.cpp
index d2884a88ad3..a28a1df91aa 100644
--- a/dom/workers/Events.cpp
+++ b/dom/workers/Events.cpp
@@ -75,6 +75,7 @@ class Event : public PrivatizableBase
 
 protected:
   bool mStopPropagationCalled;
+  bool mStopImmediatePropagationCalled;
 
 public:
   static bool
@@ -168,9 +169,16 @@ public:
     return JSVAL_TO_BOOLEAN(canceled);
   }
 
+  static bool
+  ImmediatePropagationStopped(JSContext* aCx, JSObject* aEvent)
+  {
+    Event* event = GetPrivate(aCx, aEvent);
+    return event ? event->mStopImmediatePropagationCalled : false;
+  }
+
 protected:
   Event()
-  : mStopPropagationCalled(false)
+  : mStopPropagationCalled(false), mStopImmediatePropagationCalled(false)
   {
     MOZ_COUNT_CTOR(mozilla::dom::workers::Event);
   }
@@ -230,6 +238,7 @@ protected:
                   bool aIsTrusted)
   {
     aEvent->mStopPropagationCalled = false;
+    aEvent->mStopImmediatePropagationCalled = false;
 
     jsval now;
     if (!JS_NewNumberValue(aCx, JS_Now(), &now)) {
@@ -319,6 +328,21 @@ private:
     return true;
   }
 
+  static JSBool
+  StopImmediatePropagation(JSContext* aCx, uintN aArgc, jsval* aVp)
+  {
+    JSObject* obj = JS_THIS_OBJECT(aCx, aVp);
+
+    Event* event = GetInstancePrivate(aCx, obj, sFunctions[3].name);
+    if (!event) {
+      return false;
+    }
+
+    event->mStopImmediatePropagationCalled = true;
+
+    return true;
+  }
+  
   static JSBool
   PreventDefault(JSContext* aCx, uintN aArgc, jsval* aVp)
   {
@@ -399,6 +423,7 @@ JSFunctionSpec Event::sFunctions[] = {
   JS_FN("stopPropagation", StopPropagation, 0, FUNCTION_FLAGS),
   JS_FN("preventDefault", PreventDefault, 0, FUNCTION_FLAGS),
   JS_FN("initEvent", InitEvent, 3, FUNCTION_FLAGS),
+  JS_FN("stopImmediatePropagation", StopImmediatePropagation, 0, FUNCTION_FLAGS),
   JS_FS_END
 };
 
@@ -1115,6 +1140,12 @@ EventWasCanceled(JSContext* aCx, JSObject* aEvent)
   return Event::WasCanceled(aCx, aEvent);
 }
 
+bool
+EventImmediatePropagationStopped(JSContext* aCx, JSObject* aEvent)
+{
+  return Event::ImmediatePropagationStopped(aCx, aEvent);
+}
+
 bool
 DispatchEventToTarget(JSContext* aCx, JSObject* aTarget, JSObject* aEvent,
                       bool* aPreventDefaultCalled)
diff --git a/dom/workers/Events.h b/dom/workers/Events.h
index cb5ad2a6bb6..f71e6e50f91 100644
--- a/dom/workers/Events.h
+++ b/dom/workers/Events.h
@@ -80,6 +80,9 @@ SetEventTarget(JSContext* aCx, JSObject* aEvent, JSObject* aTarget);
 bool
 EventWasCanceled(JSContext* aCx, JSObject* aEvent);
 
+bool
+EventImmediatePropagationStopped(JSContext* aCx, JSObject* aEvent);
+
 bool
 DispatchEventToTarget(JSContext* aCx, JSObject* aTarget, JSObject* aEvent,
                       bool* aPreventDefaultCalled);
diff --git a/dom/workers/Exceptions.cpp b/dom/workers/Exceptions.cpp
index d2eaf6a2685..a2bf68da813 100644
--- a/dom/workers/Exceptions.cpp
+++ b/dom/workers/Exceptions.cpp
@@ -209,6 +209,9 @@ JSPropertySpec DOMException::sStaticProperties[] = {
 #define EXCEPTION_ENTRY(_name) \
   { #_name, _name, CONSTANT_FLAGS, GetConstant, NULL },
 
+  // Make sure this one is always first.
+  EXCEPTION_ENTRY(UNKNOWN_ERR)
+
   EXCEPTION_ENTRY(INDEX_SIZE_ERR)
   EXCEPTION_ENTRY(DOMSTRING_SIZE_ERR)
   EXCEPTION_ENTRY(HIERARCHY_REQUEST_ERR)
@@ -257,7 +260,9 @@ DOMException::Create(JSContext* aCx, intN aCode)
     }
   }
 
-  JS_ASSERT(foundIndex != size_t(-1));
+  if (foundIndex == size_t(-1)) {
+    foundIndex = 0;
+  }
 
   JSString* name = JS_NewStringCopyZ(aCx, sStaticProperties[foundIndex].name);
   if (!name) {
diff --git a/dom/workers/Exceptions.h b/dom/workers/Exceptions.h
index 3f506cb3655..a6b9bc56b8b 100644
--- a/dom/workers/Exceptions.h
+++ b/dom/workers/Exceptions.h
@@ -71,6 +71,9 @@
 #define INVALID_NODE_TYPE_ERR 24
 #define DATA_CLONE_ERR 25
 
+// This one isn't actually spec'd anywhere, use it when we can't find a match.
+#define UNKNOWN_ERR 0
+
 // FileException Codes
 #define FILE_NOT_FOUND_ERR 1
 #define FILE_SECURITY_ERR 2
diff --git a/dom/workers/ListenerManager.cpp b/dom/workers/ListenerManager.cpp
index 3f7da2bb573..79ee053ab10 100644
--- a/dom/workers/ListenerManager.cpp
+++ b/dom/workers/ListenerManager.cpp
@@ -392,6 +392,10 @@ ListenerManager::DispatchEvent(JSContext* aCx, JSObject* aTarget,
   }
 
   for (size_t index = 0; index < listeners.length(); index++) {
+    if (events::EventImmediatePropagationStopped(aCx, aEvent)) {
+      break;
+    }
+
     // If anything fails in here we want to report the exception and continue on
     // to the next listener rather than bailing out. If something fails and
     // does not set an exception then we bail out entirely as we've either run
diff --git a/dom/workers/ScriptLoader.cpp b/dom/workers/ScriptLoader.cpp
index 1cf45b73542..92f2d860a60 100644
--- a/dom/workers/ScriptLoader.cpp
+++ b/dom/workers/ScriptLoader.cpp
@@ -329,10 +329,21 @@ public:
       // If this script loader is being used to make a new worker then we need
       // to do a same-origin check. Otherwise we need to clear the load with the
       // security manager.
-      rv = mIsWorkerScript ?
-           principal->CheckMayLoad(uri, false):
-           secMan->CheckLoadURIWithPrincipal(principal, uri, 0);
-      NS_ENSURE_SUCCESS(rv, rv);
+      if (mIsWorkerScript) {
+        nsCString scheme;
+        rv = uri->GetScheme(scheme);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        // We exempt data URLs from the same origin check.
+        if (!scheme.EqualsLiteral("data")) {
+          rv = principal->CheckMayLoad(uri, false);
+          NS_ENSURE_SUCCESS(rv, rv);
+        }
+      }
+      else {
+        rv = secMan->CheckLoadURIWithPrincipal(principal, uri, 0);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
 
       // We need to know which index we're on in OnStreamComplete so we know
       // where to put the result.
@@ -460,8 +471,7 @@ public:
     // worker's primary script.
     if (mIsWorkerScript) {
       // Take care of the base URI first.
-      rv = mWorkerPrivate->SetBaseURI(finalURI);
-      NS_ENSURE_SUCCESS(rv, rv);
+      mWorkerPrivate->SetBaseURI(finalURI);
 
       // Now to figure out which principal to give this worker.
       WorkerPrivate* parent = mWorkerPrivate->GetParent();
@@ -506,8 +516,16 @@ public:
           return NS_ERROR_DOM_BAD_URI;
         }
       }
-      else if (NS_FAILED(loadPrincipal->CheckMayLoad(finalURI, false))) {
-        return NS_ERROR_DOM_BAD_URI;
+      else  {
+        nsCString scheme;
+        rv = finalURI->GetScheme(scheme);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        // We exempt data urls again.
+        if (!scheme.EqualsLiteral("data") &&
+            NS_FAILED(loadPrincipal->CheckMayLoad(finalURI, false))) {
+          return NS_ERROR_DOM_BAD_URI;
+        }
       }
 
       mWorkerPrivate->SetPrincipal(channelPrincipal);
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index 5fccee66c38..2538b64b0a5 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -2082,69 +2082,62 @@ WorkerPrivateParent<Derived>::UpdateGCZeal(JSContext* aCx, PRUint8 aGCZeal)
 #endif
 
 template <class Derived>
-nsresult
+void
 WorkerPrivateParent<Derived>::SetBaseURI(nsIURI* aBaseURI)
 {
   AssertIsOnMainThread();
 
   mBaseURI = aBaseURI;
 
-  nsCOMPtr<nsIURL> url(do_QueryInterface(aBaseURI));
-  NS_ENSURE_TRUE(url, NS_ERROR_NO_INTERFACE);
+  if (NS_FAILED(aBaseURI->GetSpec(mLocationInfo.mHref))) {
+    mLocationInfo.mHref.Truncate();
+  }
 
-  nsresult rv = url->GetSpec(mLocationInfo.mHref);
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_FAILED(aBaseURI->GetHost(mLocationInfo.mHostname))) {
+    mLocationInfo.mHostname.Truncate();
+  }
 
-  rv = url->GetHost(mLocationInfo.mHostname);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = url->GetPath(mLocationInfo.mPathname);
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_FAILED(aBaseURI->GetPath(mLocationInfo.mPathname))) {
+    mLocationInfo.mPathname.Truncate();
+  }
 
   nsCString temp;
 
-  rv = url->GetQuery(temp);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!temp.IsEmpty()) {
+  nsCOMPtr<nsIURL> url(do_QueryInterface(aBaseURI));
+  if (url && NS_SUCCEEDED(url->GetQuery(temp)) && !temp.IsEmpty()) {
     mLocationInfo.mSearch.AssignLiteral("?");
     mLocationInfo.mSearch.Append(temp);
   }
 
-  rv = url->GetRef(temp);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (!temp.IsEmpty()) {
-    nsAutoString unicodeRef;
-
+  if (NS_SUCCEEDED(aBaseURI->GetRef(temp)) && !temp.IsEmpty()) {
     nsCOMPtr<nsITextToSubURI> converter =
-      do_GetService(NS_ITEXTTOSUBURI_CONTRACTID, &rv);
-    if (NS_SUCCEEDED(rv)) {
+      do_GetService(NS_ITEXTTOSUBURI_CONTRACTID);
+    if (converter) {
       nsCString charset;
-      rv = url->GetOriginCharset(charset);
-      if (NS_SUCCEEDED(rv)) {
-        rv = converter->UnEscapeURIForUI(charset, temp, unicodeRef);
-        if (NS_SUCCEEDED(rv)) {
-          mLocationInfo.mHash.AssignLiteral("#");
-          mLocationInfo.mHash.Append(NS_ConvertUTF16toUTF8(unicodeRef));
-        }
+      nsAutoString unicodeRef;
+      if (NS_SUCCEEDED(aBaseURI->GetOriginCharset(charset)) &&
+          NS_SUCCEEDED(converter->UnEscapeURIForUI(charset, temp,
+                                                   unicodeRef))) {
+        mLocationInfo.mHash.AssignLiteral("#");
+        mLocationInfo.mHash.Append(NS_ConvertUTF16toUTF8(unicodeRef));
       }
     }
 
-    if (NS_FAILED(rv)) {
+    if (mLocationInfo.mHash.IsEmpty()) {
       mLocationInfo.mHash.AssignLiteral("#");
       mLocationInfo.mHash.Append(temp);
     }
   }
 
-  rv = url->GetScheme(mLocationInfo.mProtocol);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mLocationInfo.mProtocol.AppendLiteral(":");
+  if (NS_SUCCEEDED(aBaseURI->GetScheme(mLocationInfo.mProtocol))) {
+    mLocationInfo.mProtocol.AppendLiteral(":");
+  }
+  else {
+    mLocationInfo.mProtocol.Truncate();
+  }
 
   PRInt32 port;
-  rv = url->GetPort(&port);
-  if (NS_SUCCEEDED(rv) && port != -1) {
+  if (NS_SUCCEEDED(aBaseURI->GetPort(&port)) && port != -1) {
     mLocationInfo.mPort.AppendInt(port);
 
     nsCAutoString host(mLocationInfo.mHostname);
@@ -2156,8 +2149,6 @@ WorkerPrivateParent<Derived>::SetBaseURI(nsIURI* aBaseURI)
   else {
     mLocationInfo.mHost.Assign(mLocationInfo.mHostname);
   }
-
-  return NS_OK;
 }
 
 template <class Derived>
diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index 9812d2c580f..f20fb42164d 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -271,7 +271,9 @@ public:
   void
   TraceInstance(JSTracer* aTrc)
   {
-    AssertIsOnParentThread();
+    // This should only happen on the parent thread but we can't assert that
+    // because it can also happen on the cycle collector thread when this is a
+    // top-level worker.
     events::EventTarget::TraceInstance(aTrc);
   }
 
@@ -375,7 +377,7 @@ public:
     return mBaseURI;
   }
 
-  nsresult
+  void
   SetBaseURI(nsIURI* aBaseURI);
 
   nsIURI*
diff --git a/dom/workers/test/Makefile.in b/dom/workers/test/Makefile.in
index 2b73b74043f..990d9431d46 100644
--- a/dom/workers/test/Makefile.in
+++ b/dom/workers/test/Makefile.in
@@ -55,8 +55,10 @@ _TEST_FILES = \
   test_404.html \
   test_atob.html \
   atob_worker.js \
+  test_blobWorkers.html \
   test_close.html \
   close_worker.js \
+  test_dataURLWorker.html \
   test_errorPropagation.html \
   errorPropagation_iframe.html \
   errorPropagation_worker.js \
diff --git a/dom/workers/test/eventDispatch_worker.js b/dom/workers/test/eventDispatch_worker.js
index 586eeb95e65..1b633f67248 100644
--- a/dom/workers/test/eventDispatch_worker.js
+++ b/dom/workers/test/eventDispatch_worker.js
@@ -22,9 +22,14 @@ addEventListener(fakeEventType, function(event) {
   if (event.isTrusted) {
     throw new Error("Event should be untrusted!");
   }
+  event.stopImmediatePropagation();
   postMessage(event.data);
 }, false, true);
 
+addEventListener(fakeEventType, function(event) {
+  throw new Error("This shouldn't get called because of stopImmediatePropagation.");
+}, false, true);
+
 var count = 0;
 onmessage = function(event) {
   if (event.target !== self || event.currentTarget !== self) {
diff --git a/dom/workers/test/importScripts_worker.js b/dom/workers/test/importScripts_worker.js
index 48660d1df68..e14e934660f 100644
--- a/dom/workers/test/importScripts_worker.js
+++ b/dom/workers/test/importScripts_worker.js
@@ -40,13 +40,16 @@ function tryBadScripts() {
   }
 }
 
+const url = "data:text/plain,const startResponse = 'started';";
+importScripts(url);
+
 onmessage = function(event) {
   switch (event.data) {
     case 'start':
       importScripts("importScripts_worker_imported2.js");
       importedScriptFunction2();
       tryBadScripts();
-      postMessage('started');
+      postMessage(startResponse);
       break;
     case 'stop':
       tryBadScripts();
diff --git a/dom/workers/test/test_blobWorkers.html b/dom/workers/test/test_blobWorkers.html
new file mode 100644
index 00000000000..dba65ad1bec
--- /dev/null
+++ b/dom/workers/test/test_blobWorkers.html
@@ -0,0 +1,35 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js">
+    </script>
+    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  </head>
+  <body>
+    <script type="text/javascript">
+      const message = "hi";
+
+      const workerScript =
+        "onmessage = function(event) {" +
+        "  postMessage(event.data);" +
+        "};";
+
+      var bb = new MozBlobBuilder();
+      bb.append(workerScript);
+
+      var worker = new Worker(URL.createObjectURL(bb.getBlob()));
+      worker.onmessage = function(event) {
+        is(event.data, message, "Got correct message");
+        SimpleTest.finish();
+      };
+      worker.postMessage(message);
+
+      SimpleTest.waitForExplicitFinish();
+    </script>
+  </body>
+</html>
+
diff --git a/dom/workers/test/test_dataURLWorker.html b/dom/workers/test/test_dataURLWorker.html
new file mode 100644
index 00000000000..1ff72424ff2
--- /dev/null
+++ b/dom/workers/test/test_dataURLWorker.html
@@ -0,0 +1,31 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js">
+    </script>
+    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  </head>
+  <body>
+    <script type="text/javascript">
+      const message = "hi";
+      const url = "DATA:text/plain," +
+        "onmessage = function(event) {" +
+        "  postMessage(event.data);" +
+        "};";
+
+      var worker = new Worker(url);
+      worker.onmessage = function(event) {
+        is(event.data, message, "Got correct message");
+        SimpleTest.finish();
+      };
+      worker.postMessage(message);
+
+      SimpleTest.waitForExplicitFinish();
+    </script>
+  </body>
+</html>
+
diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index 439a959eaf3..9b4c783fe0b 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -1058,6 +1058,11 @@ abstract public class GeckoApp
 
         tabs.setContentResolver(getContentResolver()); 
 
+        if (cameraView == null) {
+            cameraView = new SurfaceView(this);
+            cameraView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+        }
+
         if (surfaceView == null) {
             surfaceView = new GeckoSurfaceView(this);
             mGeckoLayout.addView(surfaceView);
@@ -1113,6 +1118,7 @@ abstract public class GeckoApp
         GeckoAppShell.registerGeckoEventListener("Gecko:Ready", GeckoApp.mAppContext);
         GeckoAppShell.registerGeckoEventListener("Toast:Show", GeckoApp.mAppContext);
 
+
         mConnectivityFilter = new IntentFilter();
         mConnectivityFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
         mConnectivityReceiver = new GeckoConnectivityReceiver();
@@ -1149,6 +1155,15 @@ abstract public class GeckoApp
         }, 50);
     }
 
+    public void enableCameraView() {
+        // Some phones (eg. nexus S) need at least a 8x16 preview size
+        mMainLayout.addView(cameraView, new AbsoluteLayout.LayoutParams(8, 16, 0, 0));
+    }
+
+    public void disableCameraView() {
+        mMainLayout.removeView(cameraView);
+    }
+
     @Override
     protected void onNewIntent(Intent intent) {
         Log.w(LOGTAG, "zerdatime " + new Date().getTime() + " - onNewIntent");
diff --git a/embedding/android/GeckoAppShell.java b/embedding/android/GeckoAppShell.java
index e1fa1694b55..5191c80e929 100644
--- a/embedding/android/GeckoAppShell.java
+++ b/embedding/android/GeckoAppShell.java
@@ -1418,6 +1418,14 @@ public class GeckoAppShell
     static int[] initCamera(String aContentType, int aCamera, int aWidth, int aHeight) {
         Log.i("GeckoAppJava", "initCamera(" + aContentType + ", " + aWidth + "x" + aHeight + ") on thread " + Thread.currentThread().getId());
 
+        getMainHandler().post(new Runnable() {
+                public void run() {
+                    try {
+                        GeckoApp.mAppContext.enableCameraView();
+                    } catch (Exception e) {}
+                }
+            });
+
         // [0] = 0|1 (failure/success)
         // [1] = width
         // [2] = height
@@ -1505,6 +1513,13 @@ public class GeckoAppShell
 
     static synchronized void closeCamera() {
         Log.i("GeckoAppJava", "closeCamera() on thread " + Thread.currentThread().getId());
+        getMainHandler().post(new Runnable() {
+                public void run() {
+                    try {
+                        GeckoApp.mAppContext.disableCameraView();
+                    } catch (Exception e) {}
+                }
+            });
         if (sCamera != null) {
             sCamera.stopPreview();
             sCamera.release();
diff --git a/gfx/harfbuzz/src/hb-buffer-private.hh b/gfx/harfbuzz/src/hb-buffer-private.hh
index a12916513d0..d8834c55046 100644
--- a/gfx/harfbuzz/src/hb-buffer-private.hh
+++ b/gfx/harfbuzz/src/hb-buffer-private.hh
@@ -99,7 +99,7 @@ struct _hb_buffer_t {
 
   unsigned int i; /* Cursor into ->info and ->pos arrays */
   unsigned int len; /* Length of ->info and ->pos arrays */
-  unsigned int out_len; /* Length of ->out array */
+  unsigned int out_len; /* Length of ->out array if have_output */
 
   hb_glyph_info_t     *info;
   hb_glyph_info_t     *out_info;
@@ -111,6 +111,8 @@ struct _hb_buffer_t {
 
 
   /* Methods */
+  inline unsigned int backtrack_len (void) const
+  { return this->have_output? this->out_len : this->i; }
   inline unsigned int next_serial (void) { return serial++; }
   inline void swap (void) { _hb_buffer_swap (this); }
   inline void clear_output (void) { _hb_buffer_clear_output (this); }
@@ -137,7 +139,6 @@ struct _hb_buffer_t {
 			 unsigned int cluster_start,
 			 unsigned int cluster_end)
   { _hb_buffer_set_masks (this, value, mask, cluster_start, cluster_end); }
-
 };
 
 
diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
index ce55c6f042c..74a9530a637 100644
--- a/gfx/harfbuzz/src/hb-buffer.cc
+++ b/gfx/harfbuzz/src/hb-buffer.cc
@@ -45,7 +45,7 @@ static hb_buffer_t _hb_buffer_nil = {
  *
  * As an optimization, both info and out_info may point to the
  * same piece of memory, which is owned by info.  This remains the
- * case as long as out_len doesn't exceed len at any time.
+ * case as long as out_len doesn't exceed i at any time.
  * In that case, swap() is no-op and the glyph operations operate
  * mostly in-place.
  *
diff --git a/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh b/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
index 1f1c88a5519..a66a981d648 100644
--- a/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
@@ -155,10 +155,10 @@ static inline bool match_backtrack (hb_apply_context_t *c,
 				    match_func_t match_func,
 				    const void *match_data)
 {
-  if (unlikely (c->buffer->out_len < count))
+  if (unlikely (c->buffer->backtrack_len () < count))
     return false;
 
-  for (unsigned int i = 0, j = c->buffer->out_len - 1; i < count; i++, j--)
+  for (unsigned int i = 0, j = c->buffer->backtrack_len () - 1; i < count; i++, j--)
   {
     while (_hb_ot_layout_skip_mark (c->layout->face, &c->buffer->out_info[j], c->lookup_props, NULL))
     {
@@ -562,7 +562,7 @@ static inline bool chain_context_lookup (hb_apply_context_t *c,
 					 ChainContextLookupContext &lookup_context)
 {
   /* First guess */
-  if (unlikely (c->buffer->out_len < backtrackCount ||
+  if (unlikely (c->buffer->backtrack_len () < backtrackCount ||
 		c->buffer->i + inputCount + lookaheadCount > c->buffer->len ||
 		inputCount + lookaheadCount > c->context_length))
     return false;
diff --git a/image/decoders/nsICODecoder.cpp b/image/decoders/nsICODecoder.cpp
index 83d025ac20d..f907cd677d5 100644
--- a/image/decoders/nsICODecoder.cpp
+++ b/image/decoders/nsICODecoder.cpp
@@ -166,12 +166,57 @@ bool nsICODecoder::FillBitmapFileHeaderBuffer(PRInt8 *bfh)
 // A BMP inside of an ICO has *2 height because of the AND mask
 // that follows the actual bitmap.  The BMP shouldn't know about
 // this difference though.
-void 
-nsICODecoder::FillBitmapInformationBufferHeight(PRInt8 *bih) 
+bool
+nsICODecoder::FixBitmapHeight(PRInt8 *bih) 
 {
-  PRInt32 height = GetRealHeight();
+  // Get the height from the BMP file information header
+  PRInt32 height;
+  memcpy(&height, bih + 8, sizeof(height));
+  height = LITTLE_TO_NATIVE32(height);
+
+  // The bitmap height is by definition * 2 what it should be to account for
+  // the 'AND mask'. It is * 2 even if the `AND mask` is not present.
+  height /= 2;
+
+  if (height > 256) {
+    return false;
+  }
+
+  // We should always trust the height from the bitmap itself instead of 
+  // the ICO height.  So fix the ICO height.
+  if (height == 256) {
+    mDirEntry.mHeight = 0;
+  } else {
+    mDirEntry.mHeight = (PRInt8)height;
+  }
+
+  // Fix the BMP height in the BIH so that the BMP decoder can work properly
   height = NATIVE32_TO_LITTLE(height);
   memcpy(bih + 8, &height, sizeof(height));
+  return true;
+}
+
+// We should always trust the contained resource for the width
+// information over our own information.
+bool
+nsICODecoder::FixBitmapWidth(PRInt8 *bih) 
+{
+  // Get the width from the BMP file information header
+  PRInt32 width;
+  memcpy(&width, bih + 4, sizeof(width));
+  width = LITTLE_TO_NATIVE32(width);
+  if (width > 256) {
+    return false;
+  }
+
+  // We should always trust the width  from the bitmap itself instead of 
+  // the ICO width.
+  if (width == 256) {
+    mDirEntry.mWidth = 0;
+  } else {
+    mDirEntry.mWidth = (PRInt8)width;
+  }
+  return true;
 }
 
 // The BMP information header's bits per pixel should be trusted
@@ -341,8 +386,7 @@ nsICODecoder::WriteInternal(const char* aBuffer, PRUint32 aCount)
 
     // Raymond Chen says that 32bpp only are valid PNG ICOs
     // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
-    if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && 
-        static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
+    if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
       PostDataError();
     }
     return;
@@ -410,8 +454,18 @@ nsICODecoder::WriteInternal(const char* aBuffer, PRUint32 aCount)
     // Setup the cursor hot spot if one is present
     SetHotSpotIfCursor();
 
-    // Fix the height on the BMP resource
-    FillBitmapInformationBufferHeight((PRInt8*)mBIHraw);
+    // Fix the ICO height from the BIH.
+    // Fix the height on the BIH to be /2 so our BMP decoder will understand.
+    if (!FixBitmapHeight(reinterpret_cast<PRInt8*>(mBIHraw))) {
+      PostDataError();
+      return;
+    }
+
+    // Fix the ICO width from the BIH.
+    if (!FixBitmapWidth(reinterpret_cast<PRInt8*>(mBIHraw))) {
+      PostDataError();
+      return;
+    }
 
     // Write out the BMP's bitmap info header
     mContainedDecoder->Write(mBIHraw, sizeof(mBIHraw));
diff --git a/image/decoders/nsICODecoder.h b/image/decoders/nsICODecoder.h
index 87dec0509c4..435b2699e4c 100644
--- a/image/decoders/nsICODecoder.h
+++ b/image/decoders/nsICODecoder.h
@@ -83,8 +83,14 @@ private:
   void SetHotSpotIfCursor();
   // Creates a bitmap file header buffer, returns true if successful
   bool FillBitmapFileHeaderBuffer(PRInt8 *bfh);
-  // Fixes the height of a BMP information header field
-  void FillBitmapInformationBufferHeight(PRInt8 *bih);
+  // Fixes the ICO height to match that of the BIH.
+  // and also fixes the BIH height to be /2 of what it was.
+  // See definition for explanation.
+  // Returns false if invalid information is contained within.
+  bool FixBitmapHeight(PRInt8 *bih);
+  // Fixes the ICO width to match that of the BIH.
+  // Returns false if invalid information is contained within.
+  bool FixBitmapWidth(PRInt8 *bih);
   // Extract bitmap info header size count from BMP information header
   PRInt32 ExtractBIHSizeFromBitmap(PRInt8 *bih);
   // Extract bit count from BMP information header
diff --git a/image/decoders/nsPNGDecoder.h b/image/decoders/nsPNGDecoder.h
index 6824232c442..2a29a563e37 100644
--- a/image/decoders/nsPNGDecoder.h
+++ b/image/decoders/nsPNGDecoder.h
@@ -73,19 +73,25 @@ public:
 
   void EndImageFrame();
 
-  // Checks if the info header contains valid information
-  bool HasValidInfo() const 
+  // Check if PNG is valid ICO (32bpp RGBA)
+  // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
+  bool IsValidICO() const
   {
-    return mInfo && mInfo->valid;
-  }
+    png_uint_32
+        png_width,  // Unused
+        png_height; // Unused
 
-  // Obtain the pixel depth if available or 0 otherwise
-  PRInt32 GetPixelDepth() const
-  {
-    if (!mInfo) {
-      return 0;
+    int png_bit_depth,
+        png_color_type;
+
+    if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
+                     &png_color_type, NULL, NULL, NULL)) {
+
+      return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+              png_bit_depth == 8);
+    } else {
+      return false;
     }
-    return mInfo->pixel_depth;
   }
 
 public:
diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp
index 57940dbe839..ffb999751f8 100644
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -2281,13 +2281,16 @@ RasterImage::WriteToDecoder(const char *aBuffer, PRUint32 aCount)
     curframe->UnlockImageData();
   }
 
-  nsresult status = mDecoder->GetDecoderError();
-  if (NS_SUCCEEDED(status)) {
-    // Keep track of the total number of bytes written over the lifetime of the
-    // decoder
-    mBytesDecoded += aCount;
-  }
-  return status;
+  if (!mDecoder)
+    return NS_ERROR_FAILURE;
+    
+  CONTAINER_ENSURE_SUCCESS(mDecoder->GetDecoderError());
+
+  // Keep track of the total number of bytes written over the lifetime of the
+  // decoder
+  mBytesDecoded += aCount;
+
+  return NS_OK;
 }
 
 // This function is called in situations where it's clear that we want the
diff --git a/image/src/SVGDocumentWrapper.cpp b/image/src/SVGDocumentWrapper.cpp
index e9f84d39b82..e2eabf2ca8d 100644
--- a/image/src/SVGDocumentWrapper.cpp
+++ b/image/src/SVGDocumentWrapper.cpp
@@ -185,13 +185,9 @@ SVGDocumentWrapper::FlushImageTransformInvalidation()
 bool
 SVGDocumentWrapper::IsAnimated()
 {
-#ifdef MOZ_SMIL
   nsIDocument* doc = mViewer->GetDocument();
   return doc && doc->HasAnimationController() &&
     doc->GetAnimationController()->HasRegisteredAnimations();
-#else
-  return false;
-#endif // MOZ_SMIL
 }
 
 void
@@ -204,12 +200,10 @@ SVGDocumentWrapper::StartAnimation()
 
   nsIDocument* doc = mViewer->GetDocument();
   if (doc) {
-#ifdef MOZ_SMIL
     nsSMILAnimationController* controller = doc->GetAnimationController();
     if (controller) {
       controller->Resume(nsSMILTimeContainer::PAUSE_IMAGE);
     }
-#endif // MOZ_SMIL
     doc->SetImagesNeedAnimating(true);
   }
 }
@@ -224,12 +218,10 @@ SVGDocumentWrapper::StopAnimation()
 
   nsIDocument* doc = mViewer->GetDocument();
   if (doc) {
-#ifdef MOZ_SMIL
     nsSMILAnimationController* controller = doc->GetAnimationController();
     if (controller) {
       controller->Pause(nsSMILTimeContainer::PAUSE_IMAGE);
     }
-#endif // MOZ_SMIL
     doc->SetImagesNeedAnimating(false);
   }
 }
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/16x16.png b/image/test/reftest/ico/ico-bmp-corrupted/16x16.png
new file mode 100644
index 00000000000..c04869e728e
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/16x16.png differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid_ico_height.ico b/image/test/reftest/ico/ico-bmp-corrupted/invalid_ico_height.ico
new file mode 100644
index 00000000000..50d68422782
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/invalid_ico_height.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid_ico_width.ico b/image/test/reftest/ico/ico-bmp-corrupted/invalid_ico_width.ico
new file mode 100644
index 00000000000..4ace07c16f9
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/invalid_ico_width.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/reftest.list b/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
index acff771efd3..69176e192f0 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
+++ b/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
@@ -9,3 +9,7 @@
 # Invalid compression value
 == wrapper.html?invalid-compression.ico about:blank
 
+# Invalid ICO width and heigth should be ignored if the
+# contained BMP is correct.
+== invalid_ico_height.ico 16x16.png
+== invalid_ico_width.ico 16x16.png
diff --git a/intl/uconv/idl/nsITextToSubURI.idl b/intl/uconv/idl/nsITextToSubURI.idl
index 7baf1db536a..46a3ff4ac8e 100644
--- a/intl/uconv/idl/nsITextToSubURI.idl
+++ b/intl/uconv/idl/nsITextToSubURI.idl
@@ -69,8 +69,8 @@ interface nsITextToSubURI : nsISupports
 
   /**
    * Unescapes only non ASCII characters in the given URI fragment 
-   * note: this method assumes the URI as UTF-8 and fallbacks to the given charset
-   * in case the data is not UTF-8
+   * note: this method assumes the URI as UTF-8 and fallbacks to the given 
+   * charset if the charset is an ASCII superset 
    *
    * @param aCharset the charset to convert from
    * @param aURIFragment the URI (or URI fragment) to unescape
diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp
index 483fdf4a30e..d5bee49979a 100644
--- a/intl/uconv/src/nsTextToSubURI.cpp
+++ b/intl/uconv/src/nsTextToSubURI.cpp
@@ -248,12 +248,24 @@ NS_IMETHODIMP  nsTextToSubURI::UnEscapeURIForUI(const nsACString & aCharset,
 }
 
 NS_IMETHODIMP  nsTextToSubURI::UnEscapeNonAsciiURI(const nsACString & aCharset, 
-                                                   const nsACString &aURIFragment, 
+                                                   const nsACString & aURIFragment, 
                                                    nsAString &_retval)
 {
   nsCAutoString unescapedSpec;
   NS_UnescapeURL(PromiseFlatCString(aURIFragment),
                  esc_AlwaysCopy | esc_OnlyNonASCII, unescapedSpec);
+  // leave the URI as it is if it's not UTF-8 and aCharset is not a ASCII
+  // superset since converting "http:" with such an encoding is always a bad 
+  // idea.
+  if (!IsUTF8(unescapedSpec) && 
+      (aCharset.LowerCaseEqualsLiteral("utf-16") ||
+       aCharset.LowerCaseEqualsLiteral("utf-16be") ||
+       aCharset.LowerCaseEqualsLiteral("utf-16le") ||
+       aCharset.LowerCaseEqualsLiteral("utf-7") ||
+       aCharset.LowerCaseEqualsLiteral("x-imap4-modified-utf7"))){
+    CopyASCIItoUTF16(aURIFragment, _retval);
+    return NS_OK;
+  }
 
   return convertURItoUnicode(PromiseFlatCString(aCharset), unescapedSpec, true, _retval);
 }
diff --git a/intl/uconv/tests/unit/test_bug699673.js b/intl/uconv/tests/unit/test_bug699673.js
new file mode 100644
index 00000000000..32dbefce36f
--- /dev/null
+++ b/intl/uconv/tests/unit/test_bug699673.js
@@ -0,0 +1,7 @@
+// Tests whether nsTextToSubURI does UTF-16 unescaping (it shouldn't)
+ function run_test()
+{
+  var testURI = "data:text/html,%FE%FF";
+  var textToSubURI = Components.classes["@mozilla.org/intl/texttosuburi;1"].getService(Components.interfaces.nsITextToSubURI);
+  do_check_eq(textToSubURI.unEscapeNonAsciiURI("UTF-16", testURI), testURI);
+}
diff --git a/intl/uconv/tests/unit/xpcshell.ini b/intl/uconv/tests/unit/xpcshell.ini
index a9a34f6b66d..5150ebdc30d 100644
--- a/intl/uconv/tests/unit/xpcshell.ini
+++ b/intl/uconv/tests/unit/xpcshell.ini
@@ -26,6 +26,7 @@ tail =
 [test_bug563283.js]
 [test_bug563618.js]
 [test_bug601429.js]
+[test_bug699673.js]
 [test_bug90411.js]
 [test_charset_conversion.js]
 [test_decode_8859-1.js]
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index d60fac4fb2c..fc48cbd6c66 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -245,6 +245,7 @@ EXPORTS_vm = \
 
 EXPORTS_ds = \
 		LifoAlloc.h \
+		BitArray.h \
 		$(NULL)
 
 EXPORTS_gc = \
diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index 6b38e772988..6829db9d868 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -535,6 +535,8 @@ ExecuteRegExp(JSContext *cx, Native native, uintN argc, Value *vp)
 
     /* Step 3. */
     JSLinearString *linearInput = input->ensureLinear(cx);
+    if (!linearInput)
+        return false;
     const jschar *chars = linearInput->chars();
     size_t length = input->length();
 
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 606b94ff1a2..d1b969becd4 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -805,11 +805,11 @@ ifneq (,$(SHARED_LIBRARY)$(PROGRAM))
 export::
 ifdef PROGRAM
 	$(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
-	  $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/$(MOZ_APP_NAME)
+	  $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/bin
 endif
 ifdef SHARED_LIBRARY
 	$(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
-	  $(SHARED_LIBRARY_NAME) $(DIST)/$(MOZ_APP_NAME)
+	  $(SHARED_LIBRARY_NAME) $(DIST)/bin
 endif
 endif # SHARED_LIBRARY || PROGRAM
 endif # WINNT_
@@ -1469,7 +1469,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	$(PYTHON_PATH) \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(topsrcdir)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
 
@@ -1482,7 +1482,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(topsrcdir)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
+	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 
 # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
 ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/toolkit/components/startup/nsTryToClose.js b/js/src/ds/BitArray.h
similarity index 51%
rename from toolkit/components/startup/nsTryToClose.js
rename to js/src/ds/BitArray.h
index ceca5f08c1b..91165f919d1 100644
--- a/toolkit/components/startup/nsTryToClose.js
+++ b/js/src/ds/BitArray.h
@@ -1,4 +1,7 @@
-/* ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
+ * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -11,15 +14,15 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is the nsTryToClose component.
+ * The Original Code is SpiderMonkey JavaScript engine.
  *
  * The Initial Developer of the Original Code is
- * Mozilla Corporation
- * Portions created by the Initial Developer are Copyright (C) 2006
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Michael Wu <flamingice@sourmilk.net>  (original author)
+ *   Terrence Cole <terrence@mozilla.com>
  *
  * 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
@@ -35,41 +38,54 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
+#ifndef BitArray_h__
+#define BitArray_h__
 
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+#include "jstypes.h" 
 
-function TryToClose() {}
+#include "js/TemplateLib.h" 
 
-TryToClose.prototype = {
-  observe: function (aSubject, aTopic, aData) {
-    switch (aTopic) {
-    case "app-startup":
-      var obsService = Cc["@mozilla.org/observer-service;1"].
-                       getService(Ci.nsIObserverService);
-      obsService.addObserver(this, "quit-application-requested", true);
-      break;
-    case "quit-application-requested":
-      var windowMediator = Cc['@mozilla.org/appshell/window-mediator;1'].
-                           getService(Ci.nsIWindowMediator);
-      var enumerator = windowMediator.getEnumerator(null);
-      while (enumerator.hasMoreElements()) {
-        var domWindow = enumerator.getNext();
-        if (("tryToClose" in domWindow) && !domWindow.tryToClose()) {
-          aSubject.QueryInterface(Ci.nsISupportsPRBool);
-          aSubject.data = true;
-          break;
-        }
-      }
-      break;
+namespace js {
+
+template <size_t nbits>
+class BitArray {
+  private:
+    uintptr_t map[nbits / JS_BITS_PER_WORD + (nbits % JS_BITS_PER_WORD == 0 ? 0 : 1)];
+
+  public:
+    void clear(bool value) {
+        if (value)
+            memset(map, 0xFF, sizeof(map));
+        else
+            memset(map, 0, sizeof(map));
     }
-  },
 
-  classID: Components.ID("{b69155f4-a8bf-453d-8653-91d1456e1d3d}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                         Ci.nsISupportsWeakReference]),
+    inline bool get(size_t offset) const {
+        uintptr_t index, mask;
+        getMarkWordAndMask(offset, &index, &mask);
+        return map[index] & mask;
+    }
+
+    inline void set(size_t offset) {
+        uintptr_t index, mask;
+        getMarkWordAndMask(offset, &index, &mask);
+        map[index] |= mask;
+    }
+
+    inline void unset(size_t offset) {
+        uintptr_t index, mask;
+        getMarkWordAndMask(offset, &index, &mask);
+        map[index] &= ~mask;
+    }
+
+  private:
+    inline void getMarkWordAndMask(size_t offset,
+                                   uintptr_t *indexp, uintptr_t *maskp) const {
+        *indexp = offset >> tl::FloorLog2<JS_BITS_PER_WORD>::result;
+        *maskp = uintptr_t(1) << (offset & (JS_BITS_PER_WORD - 1));
+    }
 };
 
-var NSGetFactory = XPCOMUtils.generateNSGetFactory([TryToClose]);
+} /* namespace js */
+
+#endif
diff --git a/js/src/jit-test/tests/basic/bug698584.js b/js/src/jit-test/tests/basic/bug698584.js
new file mode 100644
index 00000000000..8a1c894043c
--- /dev/null
+++ b/js/src/jit-test/tests/basic/bug698584.js
@@ -0,0 +1,14 @@
+// |jit-test| error: InternalError
+/* 
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+const MAX = 10000;
+var str = "";
+for (var i = 0; i < MAX; ++i) {
+    /x/.test(str);
+    str += str + 'xxxxxxxxxxxxxx';
+}
+
+/* Don't crash */
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 0c670ffe01b..cec5100111f 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3833,11 +3833,18 @@ JS_SetUCPropertyAttributes(JSContext *cx, JSObject *obj, const jschar *name, siz
 
 JS_PUBLIC_API(JSBool)
 JS_GetPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
+{
+    return JS_ForwardGetPropertyTo(cx, obj, id, obj, vp);
+}
+
+JS_PUBLIC_API(JSBool)
+JS_ForwardGetPropertyTo(JSContext *cx, JSObject *obj, jsid id, JSObject *onBehalfOf, jsval *vp)
 {
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, obj, id);
+    assertSameCompartment(cx, onBehalfOf);
     JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED);
-    return obj->getGeneric(cx, id, vp);
+    return obj->getGeneric(cx, onBehalfOf, id, vp);
 }
 
 JS_PUBLIC_API(JSBool)
@@ -3848,12 +3855,30 @@ JS_GetPropertyByIdDefault(JSContext *cx, JSObject *obj, jsid id, jsval def, jsva
 
 JS_PUBLIC_API(JSBool)
 JS_GetElement(JSContext *cx, JSObject *obj, uint32 index, jsval *vp)
+{
+    return JS_ForwardGetElementTo(cx, obj, index, obj, vp);
+}
+
+JS_PUBLIC_API(JSBool)
+JS_ForwardGetElementTo(JSContext *cx, JSObject *obj, uint32 index, JSObject *onBehalfOf, jsval *vp)
 {
     CHECK_REQUEST(cx);
-    jsid id;
-    if (!IndexToId(cx, index, &id))
+    assertSameCompartment(cx, obj);
+    JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED);
+    return obj->getElement(cx, onBehalfOf, index, vp);
+}
+
+JS_PUBLIC_API(JSBool)
+JS_GetElementIfPresent(JSContext *cx, JSObject *obj, uint32 index, JSObject *onBehalfOf, jsval *vp, JSBool* present)
+{
+    CHECK_REQUEST(cx);
+    assertSameCompartment(cx, obj);
+    JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED);
+    bool isPresent;
+    if (!obj->getElementIfPresent(cx, onBehalfOf, index, vp, &isPresent))
         return false;
-    return JS_GetPropertyById(cx, obj, id, vp);
+    *present = isPresent;
+    return true;
 }
 
 JS_PUBLIC_API(JSBool)
@@ -3909,10 +3934,9 @@ JS_PUBLIC_API(JSBool)
 JS_SetElement(JSContext *cx, JSObject *obj, uint32 index, jsval *vp)
 {
     CHECK_REQUEST(cx);
-    jsid id;
-    if (!IndexToId(cx, index, &id))
-        return false;
-    return JS_SetPropertyById(cx, obj, INT_TO_JSID(index), vp);
+    assertSameCompartment(cx, obj);
+    JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED | JSRESOLVE_ASSIGNING);
+    return obj->setElement(cx, index, vp, false);
 }
 
 JS_PUBLIC_API(JSBool)
@@ -6285,3 +6309,33 @@ BOOL WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved)
 }
 
 #endif
+
+JS_PUBLIC_API(JSBool)
+JS_IndexToId(JSContext *cx, uint32 index, jsid *id)
+{
+    return IndexToId(cx, index, id);
+}
+
+#ifdef JS_THREADSAFE
+static PRStatus
+CallOnce(void *func)
+{
+    JSInitCallback init = JS_DATA_TO_FUNC_PTR(JSInitCallback, func);
+    return init() ? PR_SUCCESS : PR_FAILURE;
+}
+#endif
+
+JS_PUBLIC_API(JSBool)
+JS_CallOnce(JSCallOnceType *once, JSInitCallback func)
+{
+#ifdef JS_THREADSAFE
+    return PR_CallOnceWithArg(once, CallOnce, JS_FUNC_TO_DATA_PTR(void *, func)) == PR_SUCCESS;
+#else
+    if (!*once) {
+        *once = true;
+        return func();
+    } else {
+        return JS_TRUE;
+    }
+#endif
+}
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index f004601d852..129e0c24f0b 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -3431,6 +3431,9 @@ JS_GetPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
 extern JS_PUBLIC_API(JSBool)
 JS_GetPropertyByIdDefault(JSContext *cx, JSObject *obj, jsid id, jsval def, jsval *vp);
 
+extern JS_PUBLIC_API(JSBool)
+JS_ForwardGetPropertyTo(JSContext *cx, JSObject *obj, jsid id, JSObject *onBehalfOf, jsval *vp);
+
 extern JS_PUBLIC_API(JSBool)
 JS_GetMethodById(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
                  jsval *vp);
@@ -3563,6 +3566,18 @@ JS_LookupElement(JSContext *cx, JSObject *obj, uint32 index, jsval *vp);
 extern JS_PUBLIC_API(JSBool)
 JS_GetElement(JSContext *cx, JSObject *obj, uint32 index, jsval *vp);
 
+extern JS_PUBLIC_API(JSBool)
+JS_ForwardGetElementTo(JSContext *cx, JSObject *obj, uint32 index, JSObject *onBehalfOf, jsval *vp);
+
+/*
+ * Get the property with name given by |index|, if it has one.  If
+ * not, |*present| will be set to false and the value of |vp| must not
+ * be relied on.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_GetElementIfPresent(JSContext *cx, JSObject *obj, uint32 index, JSObject *onBehalfOf,
+                       jsval *vp, JSBool* present);
+
 extern JS_PUBLIC_API(JSBool)
 JS_SetElement(JSContext *cx, JSObject *obj, uint32 index, jsval *vp);
 
@@ -4887,6 +4902,12 @@ extern JS_PUBLIC_API(void)
 JS_ScheduleGC(JSContext *cx, uint32 count, JSBool compartment);
 #endif
 
+/*
+ * Convert a uint32 index into a jsid.
+ */
+extern JS_PUBLIC_API(JSBool)
+JS_IndexToId(JSContext *cx, uint32 index, jsid *id);
+
 JS_END_EXTERN_C
 
 #endif /* jsapi_h___ */
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index a2c06a95111..9ceb5ed4b4d 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -362,22 +362,9 @@ JSObject::arrayGetOwnDataElement(JSContext *cx, size_t i, Value *vp)
  * to JSVAL_VOID. This function assumes that the location pointed by vp is
  * properly rooted and can be used as GC-protected storage for temporaries.
  */
-static JSBool
-GetElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool *hole, Value *vp)
+static inline JSBool
+DoGetElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool *hole, Value *vp)
 {
-    JS_ASSERT(index >= 0);
-    if (obj->isDenseArray() && index < obj->getDenseArrayInitializedLength() &&
-        !(*vp = obj->getDenseArrayElement(uint32(index))).isMagic(JS_ARRAY_HOLE)) {
-        *hole = JS_FALSE;
-        return JS_TRUE;
-    }
-    if (obj->isArguments()) {
-        if (obj->asArguments()->getElement(uint32(index), vp)) {
-            *hole = JS_FALSE;
-            return true;
-        }
-    }
-
     AutoIdRooter idr(cx);
 
     *hole = JS_FALSE;
@@ -393,8 +380,8 @@ GetElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool *hole, Value *vp
     if (!obj->lookupGeneric(cx, idr.id(), &obj2, &prop))
         return JS_FALSE;
     if (!prop) {
-        *hole = JS_TRUE;
         vp->setUndefined();
+        *hole = JS_TRUE;
     } else {
         if (!obj->getGeneric(cx, idr.id(), vp))
             return JS_FALSE;
@@ -403,6 +390,40 @@ GetElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool *hole, Value *vp
     return JS_TRUE;
 }
 
+static inline JSBool
+DoGetElement(JSContext *cx, JSObject *obj, uint32 index, JSBool *hole, Value *vp)
+{
+    bool present;
+    if (!obj->getElementIfPresent(cx, obj, index, vp, &present))
+        return false;
+
+    *hole = !present;
+    if (*hole)
+        vp->setUndefined();
+
+    return true;
+}
+
+template<typename IndexType>
+static JSBool
+GetElement(JSContext *cx, JSObject *obj, IndexType index, JSBool *hole, Value *vp)
+{
+    JS_ASSERT(index >= 0);
+    if (obj->isDenseArray() && index < obj->getDenseArrayInitializedLength() &&
+        !(*vp = obj->getDenseArrayElement(uint32(index))).isMagic(JS_ARRAY_HOLE)) {
+        *hole = JS_FALSE;
+        return JS_TRUE;
+    }
+    if (obj->isArguments()) {
+        if (obj->asArguments()->getElement(uint32(index), vp)) {
+            *hole = JS_FALSE;
+            return true;
+        }
+    }
+
+    return DoGetElement(cx, obj, index, hole, vp);
+}
+
 namespace js {
 
 static bool
@@ -799,26 +820,13 @@ array_getGeneric(JSContext *cx, JSObject *obj, JSObject *receiver, jsid id, Valu
 
     if (!js_IdIsIndex(id, &i) || i >= obj->getDenseArrayInitializedLength() ||
         obj->getDenseArrayElement(i).isMagic(JS_ARRAY_HOLE)) {
-        JSObject *obj2;
-        JSProperty *prop;
-        const Shape *shape;
-
         JSObject *proto = obj->getProto();
         if (!proto) {
             vp->setUndefined();
             return JS_TRUE;
         }
 
-        vp->setUndefined();
-        if (!LookupPropertyWithFlags(cx, proto, id, cx->resolveFlags, &obj2, &prop))
-            return JS_FALSE;
-
-        if (prop && obj2->isNative()) {
-            shape = (const Shape *) prop;
-            if (!js_NativeGet(cx, obj, obj2, shape, JSGET_METHOD_BARRIER, vp))
-                return JS_FALSE;
-        }
-        return JS_TRUE;
+        return proto->getGeneric(cx, receiver, id, vp);
     }
 
     *vp = obj->getDenseArrayElement(i);
@@ -855,22 +863,7 @@ array_getElement(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index,
         return true;
     }
 
-    vp->setUndefined();
-
-    jsid id;
-    if (!IndexToId(cx, index, &id))
-        return false;
-
-    JSObject *obj2;
-    JSProperty *prop;
-    if (!LookupPropertyWithFlags(cx, proto, id, cx->resolveFlags, &obj2, &prop))
-        return false;
-
-    if (!prop || !obj2->isNative())
-        return true;
-
-    const Shape *shape = (const Shape *) prop;
-    return js_NativeGet(cx, obj, obj2, shape, JSGET_METHOD_BARRIER, vp);
+    return proto->getElement(cx, receiver, index, vp);
 }
 
 static JSBool
@@ -1275,6 +1268,8 @@ Class js::ArrayClass = {
         array_getGeneric,
         array_getProperty,
         array_getElement,
+        NULL, /* getElementIfPresent, because this is hard for now for
+                 slow arrays */
         array_getSpecial,
         array_setGeneric,
         array_setProperty,
@@ -2663,7 +2658,7 @@ js::array_shift(JSContext *cx, uintN argc, Value *vp)
         }
 
         JSBool hole;
-        if (!GetElement(cx, obj, 0, &hole, &args.rval()))
+        if (!GetElement(cx, obj, 0u, &hole, &args.rval()))
             return JS_FALSE;
 
         /* Slide down the array above the first element. */
diff --git a/js/src/jsclass.h b/js/src/jsclass.h
index a2a8a843041..674a4d8591a 100644
--- a/js/src/jsclass.h
+++ b/js/src/jsclass.h
@@ -208,6 +208,8 @@ typedef JSBool
 typedef JSBool
 (* ElementIdOp)(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index, Value *vp);
 typedef JSBool
+(* ElementIfPresentOp)(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index, Value *vp, bool* present);
+typedef JSBool
 (* SpecialIdOp)(JSContext *cx, JSObject *obj, JSObject *receiver, SpecialId sid, Value *vp);
 typedef JSBool
 (* StrictGenericIdOp)(JSContext *cx, JSObject *obj, jsid id, Value *vp, JSBool strict);
@@ -313,6 +315,7 @@ struct ObjectOps
     GenericIdOp         getGeneric;
     PropertyIdOp        getProperty;
     ElementIdOp         getElement;
+    ElementIfPresentOp  getElementIfPresent; /* can be null */
     SpecialIdOp         getSpecial;
     StrictGenericIdOp   setGeneric;
     StrictPropertyIdOp  setProperty;
@@ -341,7 +344,7 @@ struct ObjectOps
 #define JS_NULL_OBJECT_OPS                                                    \
     {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,   \
      NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,   \
-     NULL,NULL,NULL,NULL,NULL}
+     NULL,NULL,NULL,NULL,NULL,NULL}
 
 struct Class
 {
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 037e4d93b3f..16d56caafd4 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -525,10 +525,26 @@ ChunkPool::expire(JSRuntime *rt, bool releaseAll)
     JS_ASSERT_IF(releaseAll, !emptyCount);
 }
 
+JS_FRIEND_API(int64)
+ChunkPool::countDecommittedArenas(JSRuntime *rt)
+{
+    JS_ASSERT(this == &rt->gcChunkPool);
+
+    int64 numDecommitted = 0;
+    Chunk *chunk = emptyChunkListHead;
+    while (chunk) {
+        for (uint32 i = 0; i < ArenasPerChunk; ++i)
+            if (chunk->decommittedArenas.get(i))
+                ++numDecommitted;
+        chunk = chunk->info.next;
+    }
+    return numDecommitted;
+}
+
 /* static */ Chunk *
 Chunk::allocate(JSRuntime *rt)
 {
-    Chunk *chunk = static_cast<Chunk *>(AllocGCChunk());
+    Chunk *chunk = static_cast<Chunk *>(AllocChunk());
     if (!chunk)
         return NULL;
     chunk->init();
@@ -541,30 +557,37 @@ Chunk::release(JSRuntime *rt, Chunk *chunk)
 {
     JS_ASSERT(chunk);
     rt->gcStats.count(gcstats::STAT_DESTROY_CHUNK);
-    FreeGCChunk(chunk);
+    FreeChunk(chunk);
 }
 
 void
 Chunk::init()
 {
-    JS_POISON(this, JS_FREE_PATTERN, GC_CHUNK_SIZE);
+    JS_POISON(this, JS_FREE_PATTERN, ChunkSize);
 
-    /* Assemble all arenas into a linked list and mark them as not allocated. */
-    ArenaHeader **prevp = &info.emptyArenaListHead;
-    Arena *end = &arenas[ArrayLength(arenas)];
-    for (Arena *a = &arenas[0]; a != end; ++a) {
-        *prevp = &a->aheader;
-        a->aheader.setAsNotAllocated();
-        prevp = &a->aheader.next;
-    }
-    *prevp = NULL;
-
-    /* We clear the bitmap to guard against xpc_IsGrayGCThing being called on
-       uninitialized data, which would happen before the first GC cycle. */
+    /*
+     * We clear the bitmap to guard against xpc_IsGrayGCThing being called on
+     * uninitialized data, which would happen before the first GC cycle.
+     */
     bitmap.clear();
 
+    /* Initialize the arena tracking bitmap. */ 
+    decommittedArenas.clear(false);
+
+    /* Initialize the chunk info. */
+    info.freeArenasHead = &arenas[0].aheader;
+    info.lastDecommittedArenaOffset = 0;
+    info.numArenasFree = ArenasPerChunk;
+    info.numArenasFreeCommitted = ArenasPerChunk;
     info.age = 0;
-    info.numFree = ArenasPerChunk;
+
+    /* Initialize the arena header state. */
+    for (jsuint i = 0; i < ArenasPerChunk; i++) {
+        arenas[i].aheader.setAsNotAllocated();
+        arenas[i].aheader.next = (i + 1 < ArenasPerChunk)
+                                 ? &arenas[i + 1].aheader
+                                 : NULL;
+    }
 
     /* The rest of info fields are initialized in PickChunk. */
 }
@@ -607,16 +630,66 @@ Chunk::removeFromAvailableList()
     info.next = NULL;
 }
 
+/*
+ * Search for and return the next decommitted Arena. Our goal is to keep 
+ * lastDecommittedArenaOffset "close" to a free arena. We do this by setting
+ * it to the most recently freed arena when we free, and forcing it to
+ * the last alloc + 1 when we allocate.
+ */
+jsuint
+Chunk::findDecommittedArenaOffset()
+{
+    /* Note: lastFreeArenaOffset can be past the end of the list. */
+    for (jsuint i = info.lastDecommittedArenaOffset; i < ArenasPerChunk; i++)
+        if (decommittedArenas.get(i))
+            return i;
+    for (jsuint i = 0; i < info.lastDecommittedArenaOffset; i++)
+        if (decommittedArenas.get(i))
+            return i;
+    JS_NOT_REACHED("No decommitted arenas found.");
+    return -1;
+}
+
+ArenaHeader *
+Chunk::fetchNextDecommittedArena()
+{
+    JS_ASSERT(info.numArenasFreeCommitted < info.numArenasFree);
+
+    jsuint offset = findDecommittedArenaOffset();
+    info.lastDecommittedArenaOffset = offset + 1;
+    --info.numArenasFree;
+    decommittedArenas.unset(offset);
+
+    Arena *arena = &arenas[offset];
+    CommitMemory(arena, ArenaSize);
+    arena->aheader.setAsNotAllocated();
+
+    return &arena->aheader;
+}
+
+inline ArenaHeader *
+Chunk::fetchNextFreeArena()
+{
+    JS_ASSERT(info.numArenasFreeCommitted > 0);
+
+    ArenaHeader *aheader = info.freeArenasHead;
+    info.freeArenasHead = aheader->next;
+    --info.numArenasFreeCommitted;
+    --info.numArenasFree;
+
+    return aheader;
+}
+
 ArenaHeader *
 Chunk::allocateArena(JSCompartment *comp, AllocKind thingKind)
 {
-    JS_ASSERT(hasAvailableArenas());
-    ArenaHeader *aheader = info.emptyArenaListHead;
-    info.emptyArenaListHead = aheader->next;
-    aheader->init(comp, thingKind);
-    --info.numFree;
+    JS_ASSERT(!noAvailableArenas());
 
-    if (!hasAvailableArenas())
+    ArenaHeader *aheader = JS_LIKELY(info.numArenasFreeCommitted > 0)
+                           ? fetchNextFreeArena()
+                           : fetchNextDecommittedArena();
+    aheader->init(comp, thingKind);
+    if (JS_UNLIKELY(noAvailableArenas()))
         removeFromAvailableList();
 
     JSRuntime *rt = comp->rt;
@@ -655,13 +728,15 @@ Chunk::releaseArena(ArenaHeader *aheader)
     JS_ATOMIC_ADD(&comp->gcBytes, -int32(ArenaSize));
 
     aheader->setAsNotAllocated();
-    aheader->next = info.emptyArenaListHead;
-    info.emptyArenaListHead = aheader;
-    ++info.numFree;
-    if (info.numFree == 1) {
+    aheader->next = info.freeArenasHead;
+    info.freeArenasHead = aheader;
+    ++info.numArenasFreeCommitted;
+    ++info.numArenasFree;
+
+    if (info.numArenasFree == 1) {
         JS_ASSERT(!info.prevp);
         JS_ASSERT(!info.next);
-        addToAvailableList(aheader->compartment);
+        addToAvailableList(comp);
     } else if (!unused()) {
         JS_ASSERT(info.prevp);
     } else {
@@ -850,7 +925,12 @@ MarkIfGCThingWord(JSTracer *trc, jsuword w)
     if (!Chunk::withinArenasRange(addr))
         return CGCT_NOTARENA;
 
-    ArenaHeader *aheader = &chunk->arenas[Chunk::arenaIndex(addr)].aheader;
+    /* If the arena is not currently allocated, don't access the header. */
+    size_t arenaOffset = Chunk::arenaIndex(addr);
+    if (chunk->decommittedArenas.get(arenaOffset))
+        return CGCT_FREEARENA;
+
+    ArenaHeader *aheader = &chunk->arenas[arenaOffset].aheader;
 
     if (!aheader->allocated())
         return CGCT_FREEARENA;
@@ -2292,6 +2372,46 @@ ReleaseObservedTypes(JSContext *cx)
     return releaseTypes;
 }
 
+static void
+DecommitFreePages(JSContext *cx)
+{
+    JSRuntime *rt = cx->runtime;
+
+    for (GCChunkSet::Range r(rt->gcChunkSet.all()); !r.empty(); r.popFront()) {
+        Chunk *chunk = r.front();
+        while (chunk) {
+            ArenaHeader *aheader = static_cast<ArenaHeader*>(chunk->info.freeArenasHead);
+
+            /*
+             * In the non-failure case, the list will be gone at the end of
+             * the loop. In the case where we fail, we relink all failed
+             * decommits into a new list on freeArenasHead.
+             */
+            chunk->info.freeArenasHead = NULL;
+
+            while (aheader) {
+                /* Store aside everything we will need after decommit. */
+                ArenaHeader *next = aheader->next;
+
+                bool success = DecommitMemory(aheader, ArenaSize);
+                if (!success) {
+                    aheader->next = chunk->info.freeArenasHead;
+                    chunk->info.freeArenasHead = aheader;
+                    continue;
+                }
+
+                size_t arenaOffset = Chunk::arenaIndex(reinterpret_cast<uintptr_t>(aheader));
+                chunk->decommittedArenas.set(arenaOffset);
+                --chunk->info.numArenasFreeCommitted;
+
+                aheader = next;
+            }
+
+            chunk = chunk->info.next;
+        }
+    }
+}
+
 static void
 SweepCompartments(JSContext *cx, JSGCInvocationKind gckind)
 {
@@ -2504,6 +2624,9 @@ SweepPhase(JSContext *cx, GCMarker *gcmarker, JSGCInvocationKind gckind)
          */
         rt->gcChunkPool.expire(rt, gckind == GC_SHRINK);
 #endif
+
+        if (gckind == GC_SHRINK)
+            DecommitFreePages(cx);
     }
 
     if (rt->gcCallback)
@@ -2978,6 +3101,27 @@ IterateCompartmentsArenasCells(JSContext *cx, void *data,
     }
 }
 
+void
+IterateChunks(JSContext *cx, void *data, IterateChunkCallback chunkCallback)
+{
+    /* :XXX: Any way to common this preamble with IterateCompartmentsArenasCells? */
+    CHECK_REQUEST(cx);
+    LeaveTrace(cx);
+
+    JSRuntime *rt = cx->runtime;
+    JS_ASSERT(!rt->gcRunning);
+
+    AutoLockGC lock(rt);
+    AutoGCSession gcsession(cx);
+#ifdef JS_THREADSAFE
+    rt->gcHelperThread.waitBackgroundSweepEnd();
+#endif
+    AutoUnlockGC unlock(rt);
+
+    for (js::GCChunkSet::Range r = rt->gcChunkSet.all(); !r.empty(); r.popFront())
+        chunkCallback(cx, data, r.front());
+}
+
 void
 IterateCells(JSContext *cx, JSCompartment *compartment, AllocKind thingKind,
              void *data, IterateCellCallback cellCallback)
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 697ad7576ca..ff047480bcc 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -59,6 +59,7 @@
 #include "jsgcstats.h"
 #include "jscell.h"
 
+#include "ds/BitArray.h"
 #include "gc/Statistics.h"
 #include "js/HashTable.h"
 #include "js/Vector.h"
@@ -363,6 +364,12 @@ struct ArenaHeader {
     friend struct FreeLists;
 
     JSCompartment   *compartment;
+
+    /*
+     * ArenaHeader::next has two purposes: when unallocated, it points to the
+     * next available Arena's header. When allocated, it points to the next
+     * arena of the same size class and compartment.
+     */
     ArenaHeader     *next;
 
   private:
@@ -413,18 +420,28 @@ struct ArenaHeader {
     inline uintptr_t address() const;
     inline Chunk *chunk() const;
 
-    void setAsNotAllocated() {
-        allocKind = size_t(FINALIZE_LIMIT);
-        hasDelayedMarking = 0;
-        nextDelayedMarking = 0;
-    }
-
     bool allocated() const {
         JS_ASSERT(allocKind <= size_t(FINALIZE_LIMIT));
         return allocKind < size_t(FINALIZE_LIMIT);
     }
 
-    inline void init(JSCompartment *comp, AllocKind kind);
+    void init(JSCompartment *comp, AllocKind kind) {
+        JS_ASSERT(!allocated());
+        JS_ASSERT(!hasDelayedMarking);
+        compartment = comp;
+
+        JS_STATIC_ASSERT(FINALIZE_LIMIT <= 255);
+        allocKind = size_t(kind);
+
+        /* See comments in FreeSpan::allocateFromNewArena. */
+        firstFreeSpanOffsets = FreeSpan::FullArenaOffsets;
+    }
+
+    void setAsNotAllocated() {
+        allocKind = size_t(FINALIZE_LIMIT);
+        hasDelayedMarking = 0;
+        nextDelayedMarking = 0;
+    }
 
     uintptr_t arenaAddress() const {
         return address();
@@ -543,13 +560,60 @@ struct Arena {
 struct ChunkInfo {
     Chunk           *next;
     Chunk           **prevp;
-    ArenaHeader     *emptyArenaListHead;
-    size_t          age;
-    size_t          numFree;
+
+    /* Free arenas are linked together with aheader.next. */
+    ArenaHeader     *freeArenasHead;
+
+    /*
+     * Decommitted arenas are tracked by a bitmap in the chunk header. We use
+     * this offset to start our search iteration close to a decommitted arena
+     * that we can allocate.
+     */
+    uint32          lastDecommittedArenaOffset;
+
+    /* Number of free arenas, either committed or decommitted. */
+    uint32          numArenasFree;
+
+    /* Number of free, committed arenas. */
+    uint32          numArenasFreeCommitted;
+
+    /* Number of GC cycles this chunk has survived. */
+    uint32          age;
 };
 
-const size_t BytesPerArena = ArenaSize + ArenaBitmapBytes;
-const size_t ArenasPerChunk = (GC_CHUNK_SIZE - sizeof(ChunkInfo)) / BytesPerArena;
+/*
+ * Calculating ArenasPerChunk:
+ *
+ * In order to figure out how many Arenas will fit in a chunk, we need to know
+ * how much extra space is available after we allocate the header data. This
+ * is a problem because the header size depends on the number of arenas in the
+ * chunk. The two dependent fields are bitmap and decommittedArenas.
+ *
+ * For the mark bitmap, we know that each arena will use a fixed number of full
+ * bytes: ArenaBitmapBytes. The full size of the header data is this number
+ * multiplied by the eventual number of arenas we have in the header. We, 
+ * conceptually, distribute this header data among the individual arenas and do
+ * not include it in the header. This way we do not have to worry about its 
+ * variable size: it gets attached to the variable number we are computing.
+ *
+ * For the decommitted arena bitmap, we only have 1 bit per arena, so this
+ * technique will not work. Instead, we observe that we do not have enough
+ * header info to fill 8 full arenas: it is currently 4 on 64bit, less on 
+ * 32bit. Thus, with current numbers, we need 64 bytes for decommittedArenas.
+ * This will not become 63 bytes unless we double the data required in the 
+ * header. Therefore, we just compute the number of bytes required to track 
+ * every possible arena and do not worry about slop bits, since there are too
+ * few to usefully allocate.
+ *
+ * To actually compute the number of arenas we can allocate in a chunk, we
+ * divide the amount of available space less the header info (not including
+ * the mark bitmap which is distributed into the arena size) by the size of 
+ * the arena (with the mark bitmap bytes it uses).
+ */
+const size_t BytesPerArenaWithHeader = ArenaSize + ArenaBitmapBytes;
+const size_t ChunkDecommitBitmapBytes = ChunkSize / ArenaSize / JS_BITS_PER_BYTE;
+const size_t ChunkBytesAvailable = ChunkSize - sizeof(ChunkInfo) - ChunkDecommitBitmapBytes;
+const size_t ArenasPerChunk = ChunkBytesAvailable / BytesPerArenaWithHeader;
 
 /* A chunk bitmap contains enough mark bits for all the cells in a chunk. */
 struct ChunkBitmap {
@@ -615,11 +679,14 @@ struct ChunkBitmap {
 
 JS_STATIC_ASSERT(ArenaBitmapBytes * ArenasPerChunk == sizeof(ChunkBitmap));
 
-const size_t ChunkPadSize = GC_CHUNK_SIZE
+typedef BitArray<ArenasPerChunk> PerArenaBitmap;
+
+const size_t ChunkPadSize = ChunkSize
                             - (sizeof(Arena) * ArenasPerChunk)
                             - sizeof(ChunkBitmap)
+                            - sizeof(PerArenaBitmap)
                             - sizeof(ChunkInfo);
-JS_STATIC_ASSERT(ChunkPadSize < BytesPerArena);
+JS_STATIC_ASSERT(ChunkPadSize < BytesPerArenaWithHeader);
 
 /*
  * Chunks contain arenas and associated data structures (mark bitmap, delayed
@@ -632,35 +699,36 @@ struct Chunk {
     uint8           padding[ChunkPadSize];
 
     ChunkBitmap     bitmap;
+    PerArenaBitmap  decommittedArenas;
     ChunkInfo       info;
 
     static Chunk *fromAddress(uintptr_t addr) {
-        addr &= ~GC_CHUNK_MASK;
+        addr &= ~ChunkMask;
         return reinterpret_cast<Chunk *>(addr);
     }
 
     static bool withinArenasRange(uintptr_t addr) {
-        uintptr_t offset = addr & GC_CHUNK_MASK;
+        uintptr_t offset = addr & ChunkMask;
         return offset < ArenasPerChunk * ArenaSize;
     }
 
     static size_t arenaIndex(uintptr_t addr) {
         JS_ASSERT(withinArenasRange(addr));
-        return (addr & GC_CHUNK_MASK) >> ArenaShift;
+        return (addr & ChunkMask) >> ArenaShift;
     }
 
     uintptr_t address() const {
         uintptr_t addr = reinterpret_cast<uintptr_t>(this);
-        JS_ASSERT(!(addr & GC_CHUNK_MASK));
+        JS_ASSERT(!(addr & ChunkMask));
         return addr;
     }
 
     bool unused() const {
-        return info.numFree == ArenasPerChunk;
+        return info.numArenasFree == ArenasPerChunk;
     }
 
-    bool hasAvailableArenas() const {
-        return info.numFree > 0;
+    bool noAvailableArenas() const {
+        return info.numArenasFree == 0;
     }
 
     inline void addToAvailableList(JSCompartment *compartment);
@@ -675,9 +743,16 @@ struct Chunk {
 
   private:
     inline void init();
+
+    /* Search for a decommitted arena to allocate. */
+    jsuint findDecommittedArenaOffset();
+    ArenaHeader* fetchNextDecommittedArena();
+
+    /* Unlink and return the freeArenasHead. */
+    inline ArenaHeader* fetchNextFreeArena();
 };
 
-JS_STATIC_ASSERT(sizeof(Chunk) == GC_CHUNK_SIZE);
+JS_STATIC_ASSERT(sizeof(Chunk) == ChunkSize);
 
 class ChunkPool {
     Chunk   *emptyChunkListHead;
@@ -702,6 +777,9 @@ class ChunkPool {
 
     /* Must be called either during the GC or with the GC lock taken. */
     void expire(JSRuntime *rt, bool releaseAll);
+
+    /* Must be called either during the GC or with the GC lock taken. */
+    JS_FRIEND_API(int64) countDecommittedArenas(JSRuntime *rt);
 };
 
 inline uintptr_t
@@ -726,7 +804,7 @@ Cell::chunk() const
 {
     uintptr_t addr = uintptr_t(this);
     JS_ASSERT(addr % Cell::CellSize == 0);
-    addr &= ~(GC_CHUNK_SIZE - 1);
+    addr &= ~(ChunkSize - 1);
     return reinterpret_cast<Chunk *>(addr);
 }
 
@@ -744,20 +822,6 @@ Cell::isAligned() const
 }
 #endif
 
-inline void
-ArenaHeader::init(JSCompartment *comp, AllocKind kind)
-{
-    JS_ASSERT(!allocated());
-    JS_ASSERT(!hasDelayedMarking);
-    compartment = comp;
-
-    JS_STATIC_ASSERT(FINALIZE_LIMIT <= 255);
-    allocKind = size_t(kind);
-
-    /* See comments in FreeSpan::allocateFromNewArena. */
-    firstFreeSpanOffsets = FreeSpan::FullArenaOffsets;
-}
-
 inline uintptr_t
 ArenaHeader::address() const
 {
@@ -808,7 +872,7 @@ ChunkBitmap::getMarkWordAndMask(const Cell *cell, uint32 color,
                                 uintptr_t **wordp, uintptr_t *maskp)
 {
     JS_ASSERT(cell->chunk() == Chunk::fromAddress(reinterpret_cast<uintptr_t>(this)));
-    size_t bit = (cell->address() & GC_CHUNK_MASK) / Cell::CellSize + color;
+    size_t bit = (cell->address() & ChunkMask) / Cell::CellSize + color;
     JS_ASSERT(bit < ArenaBitmapBits * ArenasPerChunk);
     *maskp = uintptr_t(1) << (bit % JS_BITS_PER_WORD);
     *wordp = &bitmap[bit / JS_BITS_PER_WORD];
@@ -1152,7 +1216,7 @@ struct ArenaLists {
  * chunks with total capacity of 16MB to avoid buffer resizes during browser
  * startup.
  */
-const size_t INITIAL_CHUNK_CAPACITY = 16 * 1024 * 1024 / GC_CHUNK_SIZE;
+const size_t INITIAL_CHUNK_CAPACITY = 16 * 1024 * 1024 / ChunkSize;
 
 /* The number of GC cycles an empty chunk can survive before been released. */
 const size_t MAX_EMPTY_CHUNK_AGE = 4;
@@ -1457,13 +1521,13 @@ struct GCChunkHasher {
      * ratio.
      */
     static HashNumber hash(gc::Chunk *chunk) {
-        JS_ASSERT(!(jsuword(chunk) & GC_CHUNK_MASK));
-        return HashNumber(jsuword(chunk) >> GC_CHUNK_SHIFT);
+        JS_ASSERT(!(jsuword(chunk) & gc::ChunkMask));
+        return HashNumber(jsuword(chunk) >> gc::ChunkShift);
     }
 
     static bool match(gc::Chunk *k, gc::Chunk *l) {
-        JS_ASSERT(!(jsuword(k) & GC_CHUNK_MASK));
-        JS_ASSERT(!(jsuword(l) & GC_CHUNK_MASK));
+        JS_ASSERT(!(jsuword(k) & gc::ChunkMask));
+        JS_ASSERT(!(jsuword(l) & gc::ChunkMask));
         return k == l;
     }
 };
@@ -1653,6 +1717,7 @@ void
 MarkStackRangeConservatively(JSTracer *trc, Value *begin, Value *end);
 
 typedef void (*IterateCompartmentCallback)(JSContext *cx, void *data, JSCompartment *compartment);
+typedef void (*IterateChunkCallback)(JSContext *cx, void *data, gc::Chunk *chunk);
 typedef void (*IterateArenaCallback)(JSContext *cx, void *data, gc::Arena *arena,
                                      JSGCTraceKind traceKind, size_t thingSize);
 typedef void (*IterateCellCallback)(JSContext *cx, void *data, void *thing,
@@ -1669,6 +1734,12 @@ IterateCompartmentsArenasCells(JSContext *cx, void *data,
                                IterateArenaCallback arenaCallback,
                                IterateCellCallback cellCallback);
 
+/*
+ * Invoke chunkCallback on every in-use chunk.
+ */
+extern JS_FRIEND_API(void)
+IterateChunks(JSContext *cx, void *data, IterateChunkCallback chunkCallback);
+
 /*
  * Invoke cellCallback on every in-use object of the specified thing kind for
  * the given compartment or for all compartments if it is null.
diff --git a/js/src/jsgcchunk.cpp b/js/src/jsgcchunk.cpp
index 2529166fe9c..c48245e3fc9 100644
--- a/js/src/jsgcchunk.cpp
+++ b/js/src/jsgcchunk.cpp
@@ -55,6 +55,7 @@
 # include <mach/mach_init.h>
 # include <mach/vm_map.h>
 # include <malloc/malloc.h>
+# include <sys/mman.h>
 
 #elif defined(XP_UNIX)
 
@@ -271,22 +272,23 @@ UnmapPages(void *addr, size_t size)
 #endif
 
 namespace js {
+namespace gc {
 
-inline void *
+static inline void *
 FindChunkStart(void *p)
 {
     jsuword addr = reinterpret_cast<jsuword>(p);
-    addr = (addr + GC_CHUNK_MASK) & ~GC_CHUNK_MASK;
+    addr = (addr + ChunkMask) & ~ChunkMask;
     return reinterpret_cast<void *>(addr);
 }
 
 void *
-AllocGCChunk()
+AllocChunk()
 {
     void *p;
 
 #ifdef JS_GC_HAS_MAP_ALIGN
-    p = MapAlignedPages(GC_CHUNK_SIZE, GC_CHUNK_SIZE);
+    p = MapAlignedPages(ChunkSize, ChunkSize);
     if (!p)
         return NULL;
 #else
@@ -296,24 +298,24 @@ AllocGCChunk()
      * final result via one mapping operation.  This means unmapping any
      * preliminary result that is not correctly aligned.
      */
-    p = MapPages(NULL, GC_CHUNK_SIZE);
+    p = MapPages(NULL, ChunkSize);
     if (!p)
         return NULL;
 
-    if (reinterpret_cast<jsuword>(p) & GC_CHUNK_MASK) {
-        UnmapPages(p, GC_CHUNK_SIZE);
-        p = MapPages(FindChunkStart(p), GC_CHUNK_SIZE);
+    if (reinterpret_cast<jsuword>(p) & ChunkMask) {
+        UnmapPages(p, ChunkSize);
+        p = MapPages(FindChunkStart(p), ChunkSize);
         while (!p) {
             /*
              * Over-allocate in order to map a memory region that is
              * definitely large enough then deallocate and allocate again the
              * correct size, within the over-sized mapping.
              */
-            p = MapPages(NULL, GC_CHUNK_SIZE * 2);
+            p = MapPages(NULL, ChunkSize * 2);
             if (!p)
                 return 0;
-            UnmapPages(p, GC_CHUNK_SIZE * 2);
-            p = MapPages(FindChunkStart(p), GC_CHUNK_SIZE);
+            UnmapPages(p, ChunkSize * 2);
+            p = MapPages(FindChunkStart(p), ChunkSize);
 
             /*
              * Failure here indicates a race with another thread, so
@@ -323,17 +325,55 @@ AllocGCChunk()
     }
 #endif /* !JS_GC_HAS_MAP_ALIGN */
 
-    JS_ASSERT(!(reinterpret_cast<jsuword>(p) & GC_CHUNK_MASK));
+    JS_ASSERT(!(reinterpret_cast<jsuword>(p) & ChunkMask));
     return p;
 }
 
 void
-FreeGCChunk(void *p)
+FreeChunk(void *p)
 {
     JS_ASSERT(p);
-    JS_ASSERT(!(reinterpret_cast<jsuword>(p) & GC_CHUNK_MASK));
-    UnmapPages(p, GC_CHUNK_SIZE);
+    JS_ASSERT(!(reinterpret_cast<jsuword>(p) & ChunkMask));
+    UnmapPages(p, ChunkSize);
 }
 
+#ifdef XP_WIN
+bool
+CommitMemory(void *addr, size_t size)
+{
+    JS_ASSERT(uintptr_t(addr) % 4096UL == 0);
+    return true;
+}
+
+bool
+DecommitMemory(void *addr, size_t size)
+{
+    JS_ASSERT(uintptr_t(addr) % 4096UL == 0);
+    LPVOID p = VirtualAlloc(addr, size, MEM_RESET, PAGE_READWRITE);
+    return p == addr;
+}
+#elif defined XP_OSX || defined XP_UNIX
+#  ifndef MADV_DONTNEED
+#    define MADV_DONTNEED MADV_FREE
+#  endif
+bool
+CommitMemory(void *addr, size_t size)
+{
+    JS_ASSERT(uintptr_t(addr) % 4096UL == 0);
+    return true;
+}
+
+bool
+DecommitMemory(void *addr, size_t size)
+{
+    JS_ASSERT(uintptr_t(addr) % 4096UL == 0);
+    int result = madvise(addr, size, MADV_DONTNEED);
+    return result != -1;
+}
+#else
+# error "No CommitMemory defined on this platform."
+#endif
+
+} /* namespace gc */
 } /* namespace js */
 
diff --git a/js/src/jsgcchunk.h b/js/src/jsgcchunk.h
index df648ce9545..465c45ba213 100644
--- a/js/src/jsgcchunk.h
+++ b/js/src/jsgcchunk.h
@@ -44,17 +44,25 @@
 #include "jsutil.h"
 
 namespace js {
+namespace gc {
 
-const size_t GC_CHUNK_SHIFT = 20;
-const size_t GC_CHUNK_SIZE = size_t(1) << GC_CHUNK_SHIFT;
-const size_t GC_CHUNK_MASK = GC_CHUNK_SIZE - 1;
+const size_t ChunkShift = 20;
+const size_t ChunkSize = size_t(1) << ChunkShift;
+const size_t ChunkMask = ChunkSize - 1;
 
 void *
-AllocGCChunk();
+AllocChunk();
 
 void
-FreeGCChunk(void *p);
+FreeChunk(void *p);
 
-}
+bool
+CommitMemory(void *addr, size_t size);
+
+bool
+DecommitMemory(void *addr, size_t size);
+
+} /* namespace gc */
+} /* namespace js */
 
 #endif /* jsgchunk_h__ */
diff --git a/js/src/jslock.cpp b/js/src/jslock.cpp
index 6db587bdff8..013bb3f4a39 100644
--- a/js/src/jslock.cpp
+++ b/js/src/jslock.cpp
@@ -37,10 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "jsapi.h"
-#include "jspubtd.h"
-#include "jstypes.h"
-
 #ifdef JS_THREADSAFE
 
 /*
@@ -55,6 +51,8 @@
 # include <unistd.h>
 #endif
 
+#include "jspubtd.h"
+#include "jstypes.h"
 #include "jsutil.h"
 #include "jsstdint.h"
 #include "jscntxt.h"
@@ -765,27 +763,4 @@ js_IsRuntimeLocked(JSRuntime *rt)
 }
 #endif /* DEBUG */
 
-static PRStatus
-CallOnce(void *func)
-{
-    JSInitCallback init = JS_DATA_TO_FUNC_PTR(JSInitCallback, func);
-    return init() ? PR_FAILURE : PR_SUCCESS;
-}
-
-JS_PUBLIC_API(JSBool)
-JS_CallOnce(JSCallOnceType *once, JSInitCallback func)
-{
-    return PR_CallOnceWithArg(once, CallOnce, JS_FUNC_TO_DATA_PTR(void *, func)) == PR_SUCCESS;
-}
-#else /* JS_THREADSAFE */
-JS_PUBLIC_API(JSBool)
-JS_CallOnce(JSCallOnceType *once, JSInitCallback func)
-{
-    if (!*once) {
-        *once = true;
-        return func();
-    } else {
-        return JS_TRUE;
-    }
-}
 #endif /* JS_THREADSAFE */
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 0842417808f..8b240da5a9b 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3457,6 +3457,7 @@ Class js::WithClass = {
         with_GetGeneric,
         with_GetProperty,
         with_GetElement,
+        NULL,             /* getElementIfPresent */
         with_GetSpecial,
         with_SetGeneric,
         with_SetProperty,
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 89500f5145d..91cb9c4b955 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -1374,6 +1374,10 @@ struct JSObject : js::gc::Cell {
     inline JSBool getProperty(JSContext *cx, JSObject *receiver, js::PropertyName *name,
                               js::Value *vp);
     inline JSBool getElement(JSContext *cx, JSObject *receiver, uint32 index, js::Value *vp);
+    /* If element is not present (e.g. array hole) *present is set to
+       false and the contents of *vp are unusable garbage. */
+    inline JSBool getElementIfPresent(JSContext *cx, JSObject *receiver, uint32 index,
+                                      js::Value *vp, bool *present);
     inline JSBool getSpecial(JSContext *cx, JSObject *receiver, js::SpecialId sid, js::Value *vp);
 
     inline JSBool getGeneric(JSContext *cx, jsid id, js::Value *vp);
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index e07f5468dc7..1611a41b1e8 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -1254,6 +1254,37 @@ JSObject::getElement(JSContext *cx, uint32 index, js::Value *vp)
     return getElement(cx, this, index, vp);
 }
 
+inline JSBool
+JSObject::getElementIfPresent(JSContext *cx, JSObject *receiver, uint32 index, js::Value *vp,
+                              bool *present)
+{
+    js::ElementIfPresentOp op = getOps()->getElementIfPresent;
+    if (op)
+        return op(cx, this, receiver, index, vp, present);
+
+    /* For now, do the index-to-id conversion just once, then use
+     * lookupGeneric/getGeneric.  Once lookupElement and getElement stop both
+     * doing index-to-id conversions, we can use those here.
+     */
+    jsid id;
+    if (!js::IndexToId(cx, index, &id))
+        return false;
+
+    JSObject *obj2;
+    JSProperty *prop;
+    if (!lookupGeneric(cx, id, &obj2, &prop))
+        return false;
+
+    if (!prop) {
+        *present = false;
+        js::Debug_SetValueRangeToCrashOnTouch(vp, 1);
+        return true;
+    }
+
+    *present = true;
+    return getGeneric(cx, receiver, id, vp);
+}
+
 inline JSBool
 JSObject::getSpecial(JSContext *cx, js::SpecialId sid, js::Value *vp)
 {
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index a432bbbf6aa..573f027bd0f 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -804,7 +804,7 @@ const char js_EscapeMap[] = {
     '"',  '"',
     '\'', '\'',
     '\\', '\\',
-    '\0', '0'
+    '\0'
 };
 
 #define DONT_ESCAPE     0x10000
@@ -852,7 +852,7 @@ QuoteString(Sprinter *sp, JSString *str, uint32 quote)
         /* Use js_EscapeMap, \u, or \x only if necessary. */
         bool ok;
         const char *e;
-        if (!(c >> 8) && (e = strchr(js_EscapeMap, (int)c)) != NULL) {
+        if (!(c >> 8) && c != 0 && (e = strchr(js_EscapeMap, (int)c)) != NULL) {
             ok = dontEscape
                  ? Sprint(sp, "%c", (char)c) >= 0
                  : Sprint(sp, "\\%c", e[1]) >= 0;
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index bba8d71f48f..ad454c48a37 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -139,6 +139,24 @@ ProxyHandler::get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, V
     return CallJSPropertyOp(cx, desc.getter, receiver, id, vp);
 }
 
+bool
+ProxyHandler::getElementIfPresent(JSContext *cx, JSObject *proxy, JSObject *receiver, uint32 index, Value *vp, bool *present)
+{
+    jsid id;
+    if (!IndexToId(cx, index, &id))
+        return false;
+
+    if (!has(cx, proxy, id, present))
+        return false;
+
+    if (!*present) {
+        Debug_SetValueRangeToCrashOnTouch(vp, 1);
+        return true;
+    }
+
+    return get(cx, proxy, receiver, id, vp);
+}   
+
 bool
 ProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,
                   Value *vp)
@@ -809,6 +827,15 @@ Proxy::get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, Value *v
     return GetProxyHandler(proxy)->get(cx, proxy, receiver, id, vp);
 }
 
+bool
+Proxy::getElementIfPresent(JSContext *cx, JSObject *proxy, JSObject *receiver, uint32 index,
+                           Value *vp, bool *present)
+{
+    JS_CHECK_RECURSION(cx, return false);
+    AutoPendingProxyOperation pending(cx, proxy);
+    return GetProxyHandler(proxy)->getElementIfPresent(cx, proxy, receiver, index, vp, present);
+}
+
 bool
 Proxy::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict, Value *vp)
 {
@@ -1017,6 +1044,13 @@ proxy_GetElement(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index,
     return proxy_GetGeneric(cx, obj, receiver, id, vp);
 }
 
+static JSBool
+proxy_GetElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index,
+                          Value *vp, bool *present)
+{
+    return Proxy::getElementIfPresent(cx, obj, receiver, index, vp, present);
+}
+
 static JSBool
 proxy_GetSpecial(JSContext *cx, JSObject *obj, JSObject *receiver, SpecialId sid, Value *vp)
 {
@@ -1251,6 +1285,7 @@ JS_FRIEND_DATA(Class) js::ObjectProxyClass = {
         proxy_GetGeneric,
         proxy_GetProperty,
         proxy_GetElement,
+        proxy_GetElementIfPresent,
         proxy_GetSpecial,
         proxy_SetGeneric,
         proxy_SetProperty,
@@ -1312,6 +1347,7 @@ JS_FRIEND_DATA(Class) js::OuterWindowProxyClass = {
         proxy_GetGeneric,
         proxy_GetProperty,
         proxy_GetElement,
+        proxy_GetElementIfPresent,
         proxy_GetSpecial,
         proxy_SetGeneric,
         proxy_SetProperty,
@@ -1385,6 +1421,7 @@ JS_FRIEND_DATA(Class) js::FunctionProxyClass = {
         proxy_GetGeneric,
         proxy_GetProperty,
         proxy_GetElement,
+        proxy_GetElementIfPresent,
         proxy_GetSpecial,
         proxy_SetGeneric,
         proxy_SetProperty,
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 2fcf214d46d..3b8c4feb2ae 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -88,6 +88,8 @@ class JS_FRIEND_API(ProxyHandler) {
     virtual bool defaultValue(JSContext *cx, JSObject *obj, JSType hint, Value *vp);
     virtual void finalize(JSContext *cx, JSObject *proxy);
     virtual void trace(JSTracer *trc, JSObject *proxy);
+    virtual bool getElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver,
+                                     JSUint32 index, Value *vp, bool *present);
 
     virtual bool isOuterWindow() {
         return false;
@@ -120,6 +122,8 @@ class Proxy {
     static bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     static bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     static bool get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, Value *vp);
+    static bool getElementIfPresent(JSContext *cx, JSObject *proxy, JSObject *receiver,
+                                    uint32 index, Value *vp, bool *present);
     static bool set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,
                     Value *vp);
     static bool keys(JSContext *cx, JSObject *proxy, AutoIdVector &props);
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 56b8a3c25fb..0ed6c5e94c3 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -392,6 +392,16 @@ ArrayBuffer::obj_getElement(JSContext *cx, JSObject *obj, JSObject *receiver, ui
     return js_GetElement(cx, delegate, receiver, index, vp);
 }
 
+JSBool
+ArrayBuffer::obj_getElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver,
+                                     uint32 index, Value *vp, bool *present)
+{
+    JSObject *delegate = DelegateObject(cx, getArrayBuffer(obj));
+    if (!delegate)
+        return false;
+    return delegate->getElementIfPresent(cx, receiver, index, vp, present);
+}
+
 JSBool
 ArrayBuffer::obj_getSpecial(JSContext *cx, JSObject *obj, JSObject *receiver, SpecialId sid, Value *vp)
 {
@@ -1004,31 +1014,16 @@ class TypedArrayTemplate
         if (isArrayIndex(cx, tarray, id, &index)) {
             // this inline function is specialized for each type
             copyIndexToValue(cx, tarray, index, vp);
-        } else {
-            JSObject *obj2;
-            JSProperty *prop;
-            const Shape *shape;
-
-            JSObject *proto = obj->getProto();
-            if (!proto) {
-                vp->setUndefined();
-                return true;
-            }
-
-            vp->setUndefined();
-            if (!LookupPropertyWithFlags(cx, proto, id, cx->resolveFlags, &obj2, &prop))
-                return false;
-
-            if (prop) {
-                if (obj2->isNative()) {
-                    shape = (Shape *) prop;
-                    if (!js_NativeGet(cx, obj, obj2, shape, JSGET_METHOD_BARRIER, vp))
-                        return false;
-                }
-            }
+            return true;
         }
 
-        return true;
+        JSObject *proto = obj->getProto();
+        if (!proto) {
+            vp->setUndefined();
+            return true;
+        }
+
+        return proto->getGeneric(cx, receiver, id, vp);
     }
 
     static JSBool
@@ -1055,22 +1050,29 @@ class TypedArrayTemplate
             return true;
         }
 
-        vp->setUndefined();
+        return proto->getElement(cx, receiver, index, vp);
+    }
 
-        jsid id;
-        if (!IndexToId(cx, index, &id))
-            return false;
+    static JSBool
+    obj_getElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index, Value *vp, bool *present)
+    {
+        // Fast-path the common case of index < length
+        JSObject *tarray = getTypedArray(obj);
 
-        JSObject *obj2;
-        JSProperty *prop;
-        if (!LookupPropertyWithFlags(cx, proto, id, cx->resolveFlags, &obj2, &prop))
-            return false;
-
-        if (!prop || !obj2->isNative())
+        if (index < getLength(tarray)) {
+            // this inline function is specialized for each type
+            copyIndexToValue(cx, tarray, index, vp);
+            *present = true;
             return true;
+        }
 
-        const Shape *shape = (Shape *) prop;
-        return js_NativeGet(cx, obj, obj2, shape, JSGET_METHOD_BARRIER, vp);
+        JSObject *proto = obj->getProto();
+        if (!proto) {
+            vp->setUndefined();
+            return true;
+        }
+
+        return proto->getElementIfPresent(cx, receiver, index, vp, present);
     }
 
     static JSBool
@@ -2105,6 +2107,7 @@ Class js::ArrayBufferClass = {
         ArrayBuffer::obj_getGeneric,
         ArrayBuffer::obj_getProperty,
         ArrayBuffer::obj_getElement,
+        ArrayBuffer::obj_getElementIfPresent,
         ArrayBuffer::obj_getSpecial,
         ArrayBuffer::obj_setGeneric,
         ArrayBuffer::obj_setProperty,
@@ -2217,6 +2220,7 @@ JSFunctionSpec _typedArray::jsfuncs[] = {                                      \
         _typedArray::obj_getGeneric,                                           \
         _typedArray::obj_getProperty,                                          \
         _typedArray::obj_getElement,                                           \
+        _typedArray::obj_getElementIfPresent,                                  \
         _typedArray::obj_getSpecial,                                           \
         _typedArray::obj_setGeneric,                                           \
         _typedArray::obj_setProperty,                                          \
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index 11893b16638..4320edea10a 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -109,6 +109,9 @@ struct JS_FRIEND_API(ArrayBuffer) {
 
     static JSBool
     obj_getElement(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index, Value *vp);
+    static JSBool
+    obj_getElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver, uint32 index,
+                            Value *vp, bool *present);
 
     static JSBool
     obj_getSpecial(JSContext *cx, JSObject *obj, JSObject *receiver, SpecialId sid, Value *vp);
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index 0dd1babcbf9..c9873505547 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -5361,6 +5361,7 @@ JS_FRIEND_DATA(Class) js::XMLClass = {
         xml_getGeneric,
         xml_getProperty,
         xml_getElement,
+        NULL, /* getElementIfPresent */
         xml_getSpecial,
         xml_setGeneric,
         xml_setProperty,
diff --git a/js/src/tests/js1_8_5/extensions/correct-this-for-nonnatives-on-array-proto-chain.js b/js/src/tests/js1_8_5/extensions/correct-this-for-nonnatives-on-array-proto-chain.js
new file mode 100644
index 00000000000..08877852470
--- /dev/null
+++ b/js/src/tests/js1_8_5/extensions/correct-this-for-nonnatives-on-array-proto-chain.js
@@ -0,0 +1,42 @@
+// Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/licenses/publicdomain/
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 699705;
+var summary =
+  "When getting a property from a dense array that lives on the proto chain "+
+  "and in particular lives on a non-native object, we should still invoke "+
+  "property getter";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+var protoArr = Proxy.create({
+    getOwnPropertyDescriptor: function(name) {
+        if (name == "foo") return { get: function() { return this[0]; } };
+        return (void 0);
+    },
+    getPropertyDescriptor: function(name) {
+        return this.getOwnPropertyDescriptor(name);
+    },
+}, null);
+void (Array.prototype.__proto__ = protoArr);
+var testArr = [ "PASS" ];
+// Make sure we don't optimize the get to a .foo get, so do the dance
+// with passing in a string.
+function f(name) {
+    return testArr[name];
+}
+var propValue = f("foo");
+assertEq(propValue, "PASS",
+	 "expected to get 'PASS' out of the getter, got: " + propValue);
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("All tests passed!");
diff --git a/js/src/tests/js1_8_5/extensions/jstests.list b/js/src/tests/js1_8_5/extensions/jstests.list
index 337eadd0d24..8328ad2782e 100644
--- a/js/src/tests/js1_8_5/extensions/jstests.list
+++ b/js/src/tests/js1_8_5/extensions/jstests.list
@@ -61,3 +61,5 @@ script regress-677924.js
 skip-if(!xulRuntime.shell) script regress-696109.js
 script regress-691746.js
 script regress-697515.js
+script correct-this-for-nonnatives-on-array-proto-chain.js
+script toSource-0.js
diff --git a/js/src/tests/js1_8_5/extensions/toSource-0.js b/js/src/tests/js1_8_5/extensions/toSource-0.js
new file mode 100644
index 00000000000..cdec97be4c9
--- /dev/null
+++ b/js/src/tests/js1_8_5/extensions/toSource-0.js
@@ -0,0 +1,14 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+ 
+assertEq(eval(uneval('\x001')), '\x001');
+
+f = eval('(' + (function () { return '\x001'; }).toString() + ')');
+assertEq(f(), '\x001');
+
+assertEq(eval('\x001'.toSource()) == '\x001', true);
+
+if (typeof reportCompare === 'function')
+  reportCompare(true, true);
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index ec585f95376..c4d012b0e6a 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -167,7 +167,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
 	  -I$(topsrcdir)/xpcom/idl-parser \
 	  $(srcdir)/qsgen.py \
 	  --idlpath=$(DEPTH)/dist/idl \
-	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
+	  --cachedir=$(DEPTH)/xpcom/idl-parser \
 	  --header-output dom_quickstubs.h \
 	  --stub-output dom_quickstubs.cpp \
 	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp
index 82271e0ed09..de5a77ecb27 100644
--- a/js/xpconnect/src/XPCConvert.cpp
+++ b/js/xpconnect/src/XPCConvert.cpp
@@ -1212,7 +1212,7 @@ XPCConvert::NativeInterface2JSObject(XPCLazyCallContext& lccx,
         wrapper = strongWrapper;
     }
 
-    if (pErr)
+    if (NS_FAILED(rv) && pErr)
         *pErr = rv;
 
     // If creating the wrapped native failed, then return early.
@@ -1228,6 +1228,8 @@ XPCConvert::NativeInterface2JSObject(XPCLazyCallContext& lccx,
         *d = v;
         if (dest)
             *dest = strongWrapper.forget().get();
+        if (pErr)
+            *pErr = NS_OK;
         return JS_TRUE;
     }
 
@@ -1294,6 +1296,9 @@ XPCConvert::NativeInterface2JSObject(XPCLazyCallContext& lccx,
         }
     }
 
+    if (pErr)
+        *pErr = NS_OK;
+
     return JS_TRUE;
 }
 
@@ -1778,9 +1783,8 @@ failure:
 // static
 JSBool
 XPCConvert::JSArray2Native(XPCCallContext& ccx, void** d, jsval s,
-                           JSUint32 count, JSUint32 capacity,
-                           const nsXPTType& type, const nsID* iid,
-                           uintN* pErr)
+                           JSUint32 count, const nsXPTType& type,
+                           const nsID* iid, uintN* pErr)
 {
     NS_PRECONDITION(d, "bad param");
 
@@ -1807,11 +1811,6 @@ XPCConvert::JSArray2Native(XPCCallContext& ccx, void** d, jsval s,
             return JS_FALSE;
         }
 
-        // If a non-zero capacity was indicated then we build an
-        // empty array rather than return nsnull.
-        if (0 != capacity)
-            goto fill_array;
-
         *d = nsnull;
         return JS_TRUE;
     }
@@ -1830,7 +1829,7 @@ XPCConvert::JSArray2Native(XPCCallContext& ccx, void** d, jsval s,
     }
 
     jsuint len;
-    if (!JS_GetArrayLength(cx, jsarray, &len) || len < count || capacity < count) {
+    if (!JS_GetArrayLength(cx, jsarray, &len) || len < count) {
         if (pErr)
             *pErr = NS_ERROR_XPC_NOT_ENOUGH_ELEMENTS_IN_ARRAY;
         return JS_FALSE;
@@ -1843,8 +1842,8 @@ XPCConvert::JSArray2Native(XPCCallContext& ccx, void** d, jsval s,
     PR_BEGIN_MACRO                                                            \
         cleanupMode = _mode;                                                  \
         size_t max = PR_UINT32_MAX / sizeof(_t);                              \
-        if (capacity > max ||                                                 \
-            nsnull == (array = nsMemory::Alloc(capacity * sizeof(_t)))) {     \
+        if (count > max ||                                                    \
+            nsnull == (array = nsMemory::Alloc(count * sizeof(_t)))) {        \
             if (pErr)                                                         \
                 *pErr = NS_ERROR_OUT_OF_MEMORY;                               \
             goto failure;                                                     \
@@ -1862,7 +1861,6 @@ XPCConvert::JSArray2Native(XPCCallContext& ccx, void** d, jsval s,
 
     // XXX make extra space at end of char* and wchar* and null termintate
 
-fill_array:
     switch (type.TagPart()) {
     case nsXPTType::T_I8            : POPULATE(na, int8);           break;
     case nsXPTType::T_I16           : POPULATE(na, int16);          break;
@@ -1970,8 +1968,7 @@ XPCConvert::NativeStringWithSize2JS(JSContext* cx,
 // static
 JSBool
 XPCConvert::JSStringWithSize2Native(XPCCallContext& ccx, void* d, jsval s,
-                                    JSUint32 count, JSUint32 capacity,
-                                    const nsXPTType& type,
+                                    JSUint32 count, const nsXPTType& type,
                                     uintN* pErr)
 {
     NS_PRECONDITION(!JSVAL_IS_NULL(s), "bad param");
@@ -1984,12 +1981,6 @@ XPCConvert::JSStringWithSize2Native(XPCCallContext& ccx, void* d, jsval s,
     if (pErr)
         *pErr = NS_ERROR_XPC_BAD_CONVERT_NATIVE;
 
-    if (capacity < count) {
-        if (pErr)
-            *pErr = NS_ERROR_XPC_NOT_ENOUGH_CHARS_IN_STRING;
-        return JS_FALSE;
-    }
-
     if (!type.IsPointer()) {
         XPC_LOG_ERROR(("XPCConvert::JSStringWithSize2Native : unsupported type"));
         return JS_FALSE;
@@ -2009,8 +2000,8 @@ XPCConvert::JSStringWithSize2Native(XPCCallContext& ccx, void* d, jsval s,
                     return JS_FALSE;
                 }
 
-                if (0 != capacity) {
-                    len = (capacity + 1) * sizeof(char);
+                if (0 != count) {
+                    len = (count + 1) * sizeof(char);
                     if (!(*((void**)d) = nsMemory::Alloc(len)))
                         return JS_FALSE;
                     return JS_TRUE;
@@ -2037,8 +2028,8 @@ XPCConvert::JSStringWithSize2Native(XPCCallContext& ccx, void* d, jsval s,
             }
             len = PRUint32(length);
 
-            if (len < capacity)
-                len = capacity;
+            if (len < count)
+                len = count;
 
             JSUint32 alloc_len = (len + 1) * sizeof(char);
             char *buffer = static_cast<char *>(nsMemory::Alloc(alloc_len));
@@ -2069,8 +2060,8 @@ XPCConvert::JSStringWithSize2Native(XPCCallContext& ccx, void* d, jsval s,
                     return JS_FALSE;
                 }
 
-                if (0 != capacity) {
-                    len = (capacity + 1) * sizeof(jschar);
+                if (0 != count) {
+                    len = (count + 1) * sizeof(jschar);
                     if (!(*((void**)d) = nsMemory::Alloc(len)))
                         return JS_FALSE;
                     return JS_TRUE;
@@ -2091,8 +2082,8 @@ XPCConvert::JSStringWithSize2Native(XPCCallContext& ccx, void* d, jsval s,
                     *pErr = NS_ERROR_XPC_NOT_ENOUGH_CHARS_IN_STRING;
                 return JS_FALSE;
             }
-            if (len < capacity)
-                len = capacity;
+            if (len < count)
+                len = count;
 
             if (!(chars = JS_GetStringCharsZ(cx, str))) {
                 return JS_FALSE;
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index 72bbd05e13a..0bf3bcfeda1 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -1284,11 +1284,21 @@ CompartmentCallback(JSContext *cx, void *vdata, JSCompartment *compartment)
                                    moz_malloc_usable_size);
 }
 
+void
+ChunkCallback(JSContext *cx, void *vdata, js::gc::Chunk *chunk)
+{
+    IterateData *data = static_cast<IterateData *>(vdata);
+    for (uint32 i = 0; i < js::gc::ArenasPerChunk; i++)
+        if (chunk->decommittedArenas.get(i))
+            data->gcHeapChunkDirtyDecommitted += js::gc::ArenaSize;
+}
+
 void
 ArenaCallback(JSContext *cx, void *vdata, js::gc::Arena *arena,
               JSGCTraceKind traceKind, size_t thingSize)
 {
     IterateData *data = static_cast<IterateData *>(vdata);
+
     data->currCompartmentStats->gcHeapArenaHeaders +=
         sizeof(js::gc::ArenaHeader);
     size_t allocationSpace = arena->thingsSpan(thingSize);
@@ -1431,7 +1441,7 @@ static PRInt64
 GetGCChunkTotalBytes()
 {
     JSRuntime *rt = nsXPConnect::GetRuntimeInstance()->GetJSRuntime();
-    return PRInt64(JS_GetGCParameter(rt, JSGC_TOTAL_CHUNKS)) * js::GC_CHUNK_SIZE;
+    return PRInt64(JS_GetGCParameter(rt, JSGC_TOTAL_CHUNKS)) * js::gc::ChunkSize;
 }
 
 NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSGCHeap,
@@ -1550,15 +1560,20 @@ CollectCompartmentStatsForRuntime(JSRuntime *rt, IterateData *data)
 
         data->compartmentStatsVector.SetCapacity(rt->compartments.length());
 
+        data->gcHeapChunkCleanDecommitted =
+            rt->gcChunkPool.countDecommittedArenas(rt) *
+            js::gc::ArenaSize;
         data->gcHeapChunkCleanUnused =
             PRInt64(JS_GetGCParameter(rt, JSGC_UNUSED_CHUNKS)) *
-            js::GC_CHUNK_SIZE;
+            js::gc::ChunkSize -
+            data->gcHeapChunkCleanDecommitted;
         data->gcHeapChunkTotal =
             PRInt64(JS_GetGCParameter(rt, JSGC_TOTAL_CHUNKS)) *
-            js::GC_CHUNK_SIZE;
+            js::gc::ChunkSize;
 
         js::IterateCompartmentsArenasCells(cx, data, CompartmentCallback,
                                            ArenaCallback, CellCallback);
+        js::IterateChunks(cx, data, ChunkCallback);
 
         for (js::ThreadDataIter i(rt); !i.empty(); i.popFront())
             data->stackSize += i.threadData()->stackSpace.committedSize();
@@ -1577,7 +1592,9 @@ CollectCompartmentStatsForRuntime(JSRuntime *rt, IterateData *data)
     // This is initialized to all bytes stored in used chunks, and then we
     // subtract used space from it each time around the loop.
     data->gcHeapChunkDirtyUnused = data->gcHeapChunkTotal -
-                                   data->gcHeapChunkCleanUnused;
+                                   data->gcHeapChunkCleanUnused -
+                                   data->gcHeapChunkCleanDecommitted -
+                                   data->gcHeapChunkDirtyDecommitted;
 
     for (PRUint32 index = 0;
          index < data->compartmentStatsVector.Length();
@@ -1625,7 +1642,7 @@ CollectCompartmentStatsForRuntime(JSRuntime *rt, IterateData *data)
 
     size_t numDirtyChunks = (data->gcHeapChunkTotal -
                              data->gcHeapChunkCleanUnused) /
-                            js::GC_CHUNK_SIZE;
+                            js::gc::ChunkSize;
     PRInt64 perChunkAdmin =
         sizeof(js::gc::Chunk) - (sizeof(js::gc::Arena) * js::gc::ArenasPerChunk);
     data->gcHeapChunkAdmin = numDirtyChunks * perChunkAdmin;
@@ -1636,6 +1653,8 @@ CollectCompartmentStatsForRuntime(JSRuntime *rt, IterateData *data)
     // they can be fractional.
     data->gcHeapUnusedPercentage = (data->gcHeapChunkCleanUnused +
                                     data->gcHeapChunkDirtyUnused +
+                                    data->gcHeapChunkCleanDecommitted +
+                                    data->gcHeapChunkDirtyDecommitted +
                                     data->gcHeapArenaUnused) * 10000 /
                                    data->gcHeapChunkTotal;
 
@@ -1915,14 +1934,25 @@ ReportJSRuntimeStats(const IterateData &data, const nsACString &pathPrefix,
                       JS_GC_HEAP_KIND, data.gcHeapChunkDirtyUnused,
                       "Memory on the garbage-collected JavaScript heap, within chunks with at "
                       "least one allocated GC thing, that could be holding useful data but "
-                      "currently isn't.",
+                      "currently isn't.  Memory here is mutually exclusive with memory reported"
+                      "under gc-heap-decommitted.",
                       callback, closure);
 
     ReportMemoryBytes(pathPrefix +
                       NS_LITERAL_CSTRING("gc-heap-chunk-clean-unused"),
                       JS_GC_HEAP_KIND, data.gcHeapChunkCleanUnused,
                       "Memory on the garbage-collected JavaScript heap taken by completely empty "
-                      "chunks, that soon will be released unless claimed for new allocations.",
+                      "chunks, that soon will be released unless claimed for new allocations.  "
+                      "Memory here is mutually exclusive with memory reported under "
+                      "gc-heap-decommitted.",
+                      callback, closure);
+
+    ReportMemoryBytes(pathPrefix +
+                      NS_LITERAL_CSTRING("gc-heap-decommitted"),
+                      JS_GC_HEAP_KIND,
+                      data.gcHeapChunkCleanDecommitted + data.gcHeapChunkDirtyDecommitted,
+                      "Memory in the address space of the garbage-collected JavaScript heap that "
+                      "is currently returned to the OS.",
                       callback, closure);
 
     ReportMemoryBytes(pathPrefix +
@@ -1931,6 +1961,7 @@ ReportJSRuntimeStats(const IterateData &data, const nsACString &pathPrefix,
                       "Memory on the garbage-collected JavaScript heap, within chunks, that is "
                       "used to hold internal book-keeping information.",
                       callback, closure);
+
 }
 
 } // namespace memory
@@ -1975,8 +2006,16 @@ public:
                           "easy comparison with other 'js-gc' reporters.",
                           callback, closure);
 
+        ReportMemoryBytes(NS_LITERAL_CSTRING("js-gc-heap-decommitted"),
+                          nsIMemoryReporter::KIND_OTHER,
+                          data.gcHeapChunkCleanDecommitted + data.gcHeapChunkDirtyDecommitted,
+                          "The same as 'explicit/js/gc-heap-decommitted'.  Shown here for "
+                          "easy comparison with other 'js-gc' reporters.",
+                          callback, closure);
+
         ReportMemoryBytes(NS_LITERAL_CSTRING("js-gc-heap-arena-unused"),
-                          nsIMemoryReporter::KIND_OTHER, data.gcHeapArenaUnused,
+                          nsIMemoryReporter::KIND_OTHER,
+                          data.gcHeapArenaUnused,
                           "Memory on the garbage-collected JavaScript heap, within arenas, that "
                           "could be holding useful data but currently isn't.  This is the sum of "
                           "all compartments' 'gc-heap/arena-unused' numbers.",
diff --git a/js/xpconnect/src/XPCVariant.cpp b/js/xpconnect/src/XPCVariant.cpp
index fdeed627882..e240634de27 100644
--- a/js/xpconnect/src/XPCVariant.cpp
+++ b/js/xpconnect/src/XPCVariant.cpp
@@ -375,8 +375,7 @@ JSBool XPCVariant::InitializeData(XPCCallContext& ccx)
             return JS_FALSE;
 
         if (!XPCConvert::JSArray2Native(ccx, &mData.u.array.mArrayValue,
-                                        val, len, len,
-                                        type, &id, nsnull))
+                                        val, len, type, &id, nsnull))
             return JS_FALSE;
 
         mData.mType = nsIDataType::VTYPE_ARRAY;
diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index fabf1c541e3..c4cf53f7bb3 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -870,17 +870,13 @@ nsXPCWrappedJSClass::GetArraySizeFromParam(JSContext* cx,
                                            const nsXPTParamInfo& param,
                                            uint16 methodIndex,
                                            uint8 paramIndex,
-                                           SizeMode mode,
                                            nsXPTCMiniVariant* nativeParams,
                                            JSUint32* result)
 {
     uint8 argnum;
     nsresult rv;
 
-    if (mode == GET_SIZE)
-        rv = mInfo->GetSizeIsArgNumberForParam(methodIndex, &param, 0, &argnum);
-    else
-        rv = mInfo->GetLengthIsArgNumberForParam(methodIndex, &param, 0, &argnum);
+    rv = mInfo->GetSizeIsArgNumberForParam(methodIndex, &param, 0, &argnum);
     if (NS_FAILED(rv))
         return JS_FALSE;
 
@@ -1421,8 +1417,7 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex,
 
             if (isArray || isSizedString) {
                 if (!GetArraySizeFromParam(cx, info, param, methodIndex,
-                                           i, GET_LENGTH, nativeParams,
-                                           &array_count))
+                                           i, nativeParams, &array_count))
                     goto pre_call_clean_up;
             }
 
@@ -1495,10 +1490,12 @@ pre_call_clean_up:
                                                             1, &datum_type)) &&
                         datum_type.IsPointer() &&
                         GetArraySizeFromParam(cx, info, param, methodIndex,
-                                              i, GET_LENGTH, nativeParams,
-                                              &array_count) && array_count) {
+                                              i, nativeParams, &array_count) &&
+                        array_count) {
+
                         CleanupPointerArray(datum_type, array_count, pp);
                     }
+
                     // always release the array if it is inout
                     nsMemory::Free(pp);
                 }
@@ -1669,23 +1666,21 @@ pre_call_clean_up:
 
             if (isArray || isSizedString) {
                 if (!GetArraySizeFromParam(cx, info, param, methodIndex,
-                                           i, GET_LENGTH, nativeParams,
-                                           &array_count))
+                                           i, nativeParams, &array_count))
                     break;
             }
 
             if (isArray) {
                 if (array_count &&
                     !XPCConvert::JSArray2Native(ccx, (void**)&pv->val, val,
-                                                array_count, array_count,
-                                                datum_type, &param_iid,
-                                                nsnull))
+                                                array_count, datum_type,
+                                                &param_iid, nsnull))
                     break;
             } else if (isSizedString) {
                 if (!XPCConvert::JSStringWithSize2Native(ccx,
                                                          (void*)&pv->val, val,
-                                                         array_count, array_count,
-                                                         datum_type, nsnull))
+                                                         array_count, datum_type,
+                                                         nsnull))
                     break;
             } else {
                 if (!XPCConvert::JSData2Native(ccx, &pv->val, val, type,
@@ -1722,8 +1717,9 @@ pre_call_clean_up:
                                                             1, &datum_type)) &&
                         datum_type.IsPointer() &&
                         GetArraySizeFromParam(cx, info, param, methodIndex,
-                                              k, GET_LENGTH, nativeParams,
-                                              &array_count) && array_count) {
+                                              k, nativeParams, &array_count) &&
+                        array_count) {
+
                         CleanupPointerArray(datum_type, array_count, pp);
                     }
                     nsMemory::Free(pp);
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index ad1acdcbe96..6743681e381 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -2026,26 +2026,8 @@ class CallMethodHelper
     jsval* const mArgv;
     const PRUint32 mArgc;
 
-    enum SizeMode {
-        eGetSize,
-        eGetLength
-    };
-
     JS_ALWAYS_INLINE JSBool
-    GetArrayInfoFromParam(uint8 paramIndex, SizeMode mode,
-                          JSUint32* result) const;
-
-    JSBool
-    GetArraySizeFromParam(uint8 paramIndex, JSUint32* result) const
-    {
-        return GetArrayInfoFromParam(paramIndex, eGetSize, result);
-    }
-
-    JSBool
-    GetArrayLengthFromParam(uint8 paramIndex, JSUint32* result) const
-    {
-        return GetArrayInfoFromParam(paramIndex, eGetLength, result);
-    }
+    GetArraySizeFromParam(uint8 paramIndex, JSUint32* result) const;
 
     JS_ALWAYS_INLINE JSBool
     GetInterfaceTypeFromParam(uint8 paramIndex,
@@ -2270,7 +2252,7 @@ CallMethodHelper::~CallMethodHelper()
 }
 
 JSBool
-CallMethodHelper::GetArrayInfoFromParam(uint8 paramIndex, SizeMode mode,
+CallMethodHelper::GetArraySizeFromParam(uint8 paramIndex,
                                         JSUint32* result) const
 {
     nsresult rv;
@@ -2278,10 +2260,7 @@ CallMethodHelper::GetArrayInfoFromParam(uint8 paramIndex, SizeMode mode,
 
     // TODO fixup the various exceptions that are thrown
 
-    if (mode == eGetSize)
-        rv = mIFaceInfo->GetSizeIsArgNumberForParam(mVTableIndex, &paramInfo, 0, &paramIndex);
-    else
-        rv = mIFaceInfo->GetLengthIsArgNumberForParam(mVTableIndex, &paramInfo, 0, &paramIndex);
+    rv = mIFaceInfo->GetSizeIsArgNumberForParam(mVTableIndex, &paramInfo, 0, &paramIndex);
     if (NS_FAILED(rv))
         return Throw(NS_ERROR_XPC_CANT_GET_ARRAY_INFO, mCallContext);
 
@@ -2700,7 +2679,6 @@ CallMethodHelper::ConvertDependentParams()
 
         nsXPTType datum_type;
         JSUint32 array_count;
-        JSUint32 array_capacity;
         bool isArray = type.IsArray();
 
         bool isSizedString = isArray ?
@@ -2764,16 +2742,14 @@ CallMethodHelper::ConvertDependentParams()
         uintN err;
 
         if (isArray || isSizedString) {
-            if (!GetArraySizeFromParam(i, &array_capacity) ||
-                !GetArrayLengthFromParam(i, &array_count))
+            if (!GetArraySizeFromParam(i, &array_count))
                 return JS_FALSE;
 
             if (isArray) {
                 if (array_count &&
                     !XPCConvert::JSArray2Native(mCallContext, (void**)&dp->val, src,
-                                                array_count, array_capacity,
-                                                datum_type,
-                                                &param_iid, &err)) {
+                                                array_count, datum_type, &param_iid,
+                                                &err)) {
                     // XXX need exception scheme for arrays to indicate bad element
                     ThrowBadParam(err, i, mCallContext);
                     return JS_FALSE;
@@ -2782,8 +2758,7 @@ CallMethodHelper::ConvertDependentParams()
             {
                 if (!XPCConvert::JSStringWithSize2Native(mCallContext,
                                                          (void*)&dp->val,
-                                                         src,
-                                                         array_count, array_capacity,
+                                                         src, array_count,
                                                          datum_type, &err)) {
                     ThrowBadParam(err, i, mCallContext);
                     return JS_FALSE;
diff --git a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
index 4e185e5c317..b1e3864d2a5 100644
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -866,6 +866,7 @@ js::Class XPC_WN_NoHelper_JSClass = {
         nsnull, // getGeneric
         nsnull, // getProperty
         nsnull, // getElement
+        nsnull, // getElementIfPresent
         nsnull, // getSpecial
         nsnull, // setGeneric
         nsnull, // setProperty
diff --git a/js/xpconnect/src/dombindings.cpp b/js/xpconnect/src/dombindings.cpp
index b1f38681622..455f0889746 100644
--- a/js/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -975,7 +975,7 @@ ListBase<LC>::getPropertyOnPrototype(JSContext *cx, JSObject *proxy, jsid id, bo
     if (!hasProp || !vp)
         return true;
 
-    return JS_GetPropertyById(cx, proto, id, vp);
+    return JS_ForwardGetPropertyTo(cx, proto, id, proxy, vp);
 }
 
 template<class LC>
@@ -1042,6 +1042,52 @@ ListBase<LC>::get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, V
     return true;
 }
 
+template<class LC>
+bool
+ListBase<LC>::getElementIfPresent(JSContext *cx, JSObject *proxy, JSObject *receiver,
+                                  uint32 index, Value *vp, bool *present)
+{
+    if (hasIndexGetter) {
+        IndexGetterType result;
+        *present = getItemAt(getListObject(proxy), index, result);
+        if (*present)
+            return Wrap(cx, proxy, result, vp);
+
+        vp->setUndefined();
+        return true;
+    }
+
+    jsid id;
+    if (!JS_IndexToId(cx, index, &id))
+        return false;
+
+    JSObject *expando = getExpandoObject(proxy);
+    if (expando) {
+        JSBool isPresent;
+        if (!JS_GetElementIfPresent(cx, expando, index, expando, vp, &isPresent))
+            return false;
+        if (isPresent) {
+            *present = true;
+            return true;
+        }
+    }
+
+    // No need to worry about name getters here, so just check the proto.
+
+    JSObject *proto = js::GetObjectProto(proxy);
+    if (proto) {
+        JSBool isPresent;
+        if (!JS_GetElementIfPresent(cx, proto, index, proxy, vp, &isPresent))
+            return false;
+        *present = isPresent;
+        return true;
+    }
+
+    *present = false;
+    // Can't Debug_SetValueRangeToCrashOnTouch because it's not public
+    return true;
+}
+
 template<class LC>
 bool
 ListBase<LC>::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,
diff --git a/js/xpconnect/src/dombindings.h b/js/xpconnect/src/dombindings.h
index 86b31e3453e..bb4fb057edf 100644
--- a/js/xpconnect/src/dombindings.h
+++ b/js/xpconnect/src/dombindings.h
@@ -225,6 +225,8 @@ public:
     bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
     bool get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, js::Value *vp);
+    bool getElementIfPresent(JSContext *cx, JSObject *proxy, JSObject *receiver,
+                             uint32 index, js::Value *vp, bool *present);
     bool set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,
              js::Value *vp);
     bool keys(JSContext *cx, JSObject *proxy, js::AutoIdVector &props);
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index c006b7e4b7e..5ce3f9a51ee 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -1407,6 +1407,7 @@ XPC_WN_JSOp_ThisObject(JSContext *cx, JSObject *obj);
         nsnull, /* getGeneric    */                                           \
         nsnull, /* getProperty    */                                          \
         nsnull, /* getElement    */                                           \
+        nsnull, /* getElementIfPresent */                                     \
         nsnull, /* getSpecial    */                                           \
         nsnull, /* setGeneric    */                                           \
         nsnull, /* setProperty    */                                          \
@@ -1444,6 +1445,7 @@ XPC_WN_JSOp_ThisObject(JSContext *cx, JSObject *obj);
         nsnull, /* getGeneric    */                                           \
         nsnull, /* getProperty    */                                          \
         nsnull, /* getElement    */                                           \
+        nsnull, /* getElementIfPresent */                                     \
         nsnull, /* getSpecial    */                                           \
         nsnull, /* setGeneric    */                                           \
         nsnull, /* setProperty    */                                          \
@@ -2924,14 +2926,11 @@ private:
         {if (b) mDescriptors[i/32] |= (1 << (i%32));
          else mDescriptors[i/32] &= ~(1 << (i%32));}
 
-    enum SizeMode {GET_SIZE, GET_LENGTH};
-
     JSBool GetArraySizeFromParam(JSContext* cx,
                                  const XPTMethodDescriptor* method,
                                  const nsXPTParamInfo& param,
                                  uint16 methodIndex,
                                  uint8 paramIndex,
-                                 SizeMode mode,
                                  nsXPTCMiniVariant* params,
                                  JSUint32* result);
 
@@ -3317,9 +3316,8 @@ public:
                                  JSUint32 count, nsresult* pErr);
 
     static JSBool JSArray2Native(XPCCallContext& ccx, void** d, jsval s,
-                                 JSUint32 count, JSUint32 capacity,
-                                 const nsXPTType& type, const nsID* iid,
-                                 uintN* pErr);
+                                 JSUint32 count, const nsXPTType& type,
+                                 const nsID* iid, uintN* pErr);
 
     static JSBool NativeStringWithSize2JS(JSContext* cx,
                                           jsval* d, const void* s,
@@ -3328,8 +3326,8 @@ public:
                                           nsresult* pErr);
 
     static JSBool JSStringWithSize2Native(XPCCallContext& ccx, void* d, jsval s,
-                                          JSUint32 count, JSUint32 capacity,
-                                          const nsXPTType& type, uintN* pErr);
+                                          JSUint32 count, const nsXPTType& type,
+                                          uintN* pErr);
 
     static nsresult JSValToXPCException(XPCCallContext& ccx,
                                         jsval s,
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index 1b84851f18e..5d51da723a8 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -237,6 +237,8 @@ struct IterateData
         gcHeapChunkTotal(0),
         gcHeapChunkCleanUnused(0),
         gcHeapChunkDirtyUnused(0),
+        gcHeapChunkCleanDecommitted(0),
+        gcHeapChunkDirtyDecommitted(0),
         gcHeapArenaUnused(0),
         gcHeapChunkAdmin(0),
         gcHeapUnusedPercentage(0),
@@ -258,6 +260,8 @@ struct IterateData
     PRInt64 gcHeapChunkTotal;
     PRInt64 gcHeapChunkCleanUnused;
     PRInt64 gcHeapChunkDirtyUnused;
+    PRInt64 gcHeapChunkCleanDecommitted;
+    PRInt64 gcHeapChunkDirtyDecommitted;
     PRInt64 gcHeapArenaUnused;
     PRInt64 gcHeapChunkAdmin;
     PRInt64 gcHeapUnusedPercentage;
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 60f370d2c19..e1587dbbcc1 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -97,10 +97,7 @@
 #include "nsIFrameMessageManager.h"
 #include "FrameLayerBuilder.h"
 #include "nsDOMMediaQueryList.h"
-
-#ifdef MOZ_SMIL
 #include "nsSMILAnimationController.h"
-#endif // MOZ_SMIL
 
 #ifdef IBMBIDI
 #include "nsBidiPresUtils.h"
@@ -1208,7 +1205,6 @@ void nsPresContext::SetImgAnimations(nsIContent *aParent, PRUint16 aMode)
   }
 }
 
-#ifdef MOZ_SMIL
 void
 nsPresContext::SetSMILAnimations(nsIDocument *aDoc, PRUint16 aNewMode,
                                  PRUint16 aOldMode)
@@ -1230,7 +1226,6 @@ nsPresContext::SetSMILAnimations(nsIDocument *aDoc, PRUint16 aNewMode,
     }
   }
 }
-#endif // MOZ_SMIL
 
 void
 nsPresContext::SetImageAnimationModeInternal(PRUint16 aMode)
@@ -1256,10 +1251,7 @@ nsPresContext::SetImageAnimationModeInternal(PRUint16 aMode)
       if (rootElement) {
         SetImgAnimations(rootElement, aMode);
       }
-
-#ifdef MOZ_SMIL
       SetSMILAnimations(doc, aMode, mImageAnimationMode);
-#endif // MOZ_SMIL
     }
   }
 
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index fa089302b1b..ecd01d831b3 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -992,10 +992,8 @@ protected:
   NS_HIDDEN_(void) SysColorChangedInternal();
 
   NS_HIDDEN_(void) SetImgAnimations(nsIContent *aParent, PRUint16 aMode);
-#ifdef MOZ_SMIL
   NS_HIDDEN_(void) SetSMILAnimations(nsIDocument *aDoc, PRUint16 aNewMode,
                                      PRUint16 aOldMode);
-#endif // MOZ_SMIL
   NS_HIDDEN_(void) GetDocumentColorPreferences();
 
   NS_HIDDEN_(void) PreferenceChanged(const char* aPrefName);
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index d09cef11145..86be9178375 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -149,9 +149,7 @@
 #ifdef MOZ_MEDIA
 #include "nsHTMLMediaElement.h"
 #endif
-#ifdef MOZ_SMIL
 #include "nsSMILAnimationController.h"
-#endif
 
 #include "nsRefreshDriver.h"
 
@@ -1124,12 +1122,10 @@ PresShell::Init(nsIDocument* aDocument,
     }
 #endif
 
-#ifdef MOZ_SMIL
   if (mDocument->HasAnimationController()) {
     nsSMILAnimationController* animCtrl = mDocument->GetAnimationController();
     animCtrl->NotifyRefreshDriverCreated(GetPresContext()->RefreshDriver());
   }
-#endif // MOZ_SMIL
 
   // Get our activeness from the docShell.
   QueryIsActive();
@@ -1254,11 +1250,9 @@ PresShell::Destroy()
     NS_ASSERTION(mDocument->GetShell() == this, "Wrong shell?");
     mDocument->DeleteShell();
 
-#ifdef MOZ_SMIL
     if (mDocument->HasAnimationController()) {
       mDocument->GetAnimationController()->NotifyRefreshDriverDestroying(rd);
     }
-#endif // MOZ_SMIL
   }
 
   // Revoke any pending events.  We need to do this and cancel pending reflows
@@ -4044,12 +4038,10 @@ PresShell::FlushPendingNotifications(mozFlushType aType)
       // reflow).
       mPresContext->FlushUserFontSet();
 
-#ifdef MOZ_SMIL
       // Flush any requested SMIL samples.
       if (mDocument->HasAnimationController()) {
         mDocument->GetAnimationController()->FlushResampleRequests();
       }
-#endif // MOZ_SMIL
 
       nsAutoScriptBlocker scriptBlocker;
       mFrameConstructor->CreateNeededFrames();
diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index 16154bf6e3d..4b58fa5097a 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -162,9 +162,14 @@ _TEST_FILES =	\
 		test_bug548545.xhtml \
 		test_bug558663.html \
 		test_bug559499.html \
+		test_bug569520.html \
 		test_bug582181-1.html \
 		test_bug582181-2.html \
+		test_bug588174.html \
+		test_bug607529.html \
+		file_bug607529.html \
 		test_bug677878.html \
+		test_bug696020.html \
 		test_flush_on_paint.html \
 		test_mozPaintCount.html \
 		test_scroll_selection_into_view.html \
@@ -179,10 +184,17 @@ _TEST_FILES =	\
 
 # Tests for bugs 441782, 467672 and 570378 don't pass reliably on Windows, because of bug 469208
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
+# THESE TESTS (BELOW) DO NOT RUN ON WINDOWS
 _TEST_FILES += \
 		bidi_numeral_test.js \
+		$(NULL)
+# THESE TESTS (ABOVE AND BELOW) DO NOT RUN ON WINDOWS
+_TEST_FILES += \
 		test_bug332655-1.html \
 		test_bug332655-2.html \
+		$(NULL)
+# THESE TESTS (ABOVE AND BELOW) DO NOT RUN ON WINDOWS
+_TEST_FILES += \
 		test_bug441782-1a.html \
 		test_bug441782-1b.html \
 		test_bug441782-1c.html \
@@ -218,6 +230,9 @@ _TEST_FILES += \
 		test_bug441782-5e.html \
 		bug441782-5.html \
 		bug441782-5-ref.html \
+		$(NULL)
+# THESE TESTS (ABOVE AND BELOW) DO NOT RUN ON WINDOWS
+_TEST_FILES += \
 		test_bug467672-1a.html \
 		test_bug467672-1b.html \
 		test_bug467672-1c.html \
@@ -263,8 +278,13 @@ _TEST_FILES += \
 		test_bug467672-5g.html \
 		bug467672-5.html \
 		bug467672-5-ref.html \
+		$(NULL)
+# THESE TESTS (ABOVE AND BELOW) DO NOT RUN ON WINDOWS
+_TEST_FILES += \
 		test_bug499538-1.html \
-		test_bug569520.html \
+		$(NULL)
+# THESE TESTS (ABOVE AND BELOW) DO NOT RUN ON WINDOWS
+_TEST_FILES += \
 		test_bug570378-arabic-1a.html \
 		test_bug570378-arabic-1b.html \
 		test_bug570378-arabic-1c.html \
@@ -345,12 +365,12 @@ _TEST_FILES += \
 		test_bug570378-persian-5g.html \
 		bug570378-persian-5.html \
 		bug570378-persian-5-ref.html \
-		test_bug588174.html \
-		test_bug607529.html \
-		file_bug607529.html \
-		test_bug644768.html \
-		test_bug696020.html \
 		$(NULL)
+# THESE TESTS (ABOVE AND BELOW) DO NOT RUN ON WINDOWS
+_TEST_FILES += \
+		test_bug644768.html \
+		$(NULL)
+# THESE TESTS (ABOVE) DO NOT RUN ON WINDOWS
 endif
 
 _BROWSER_FILES = \
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index bf7b9de51ee..560c892c44b 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -6122,7 +6122,6 @@ DisplayLine(nsDisplayListBuilder* aBuilder, const nsRect& aLineArea,
 
   nsDisplayListCollection collection;
   nsresult rv;
-  nsDisplayList aboveTextDecorations;
 
   // Block-level child backgrounds go on the blockBorderBackgrounds list ...
   // Inline-level child backgrounds go on the regular child content list.
@@ -6137,8 +6136,6 @@ DisplayLine(nsDisplayListBuilder* aBuilder, const nsRect& aLineArea,
     kid = kid->GetNextSibling();
   }
   
-  collection.Content()->AppendToTop(&aboveTextDecorations);
-
   if (lineMayHaveTextOverflow) {
     aTextOverflow->ProcessLine(collection, aLine.get());
   }
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 59bf434d088..1aa9822f17d 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -55,8 +55,6 @@
 #include "nsIServiceManager.h"
 #include "nsIPercentHeightObserver.h"
 #include "nsLayoutUtils.h"
-#include "nsPlaceholderFrame.h"
-#include "nsFrameManager.h"
 #include "mozilla/Preferences.h"
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"
@@ -851,7 +849,7 @@ static bool AreAllEarlierInFlowFramesEmpty(nsIFrame* aFrame,
 // cbrs->frame is the actual containing block
 void
 nsHTMLReflowState::CalculateHypotheticalBox(nsPresContext*    aPresContext,
-                                            nsPlaceholderFrame* aPlaceholderFrame,
+                                            nsIFrame*         aPlaceholderFrame,
                                             nsIFrame*         aContainingBlock,
                                             nscoord           aBlockLeftContentEdge,
                                             nscoord           aBlockContentWidth,
@@ -934,12 +932,17 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsPresContext*    aPresContext,
     nsLayoutUtils::GetAsBlock(aContainingBlock->GetContentInsertionFrame());
   if (blockFrame) {
     nscoord blockYOffset = blockFrame->GetOffsetTo(aContainingBlock).y;
-    const nsLineBox* lineBox = aPlaceholderFrame->GetCachedLineBox();
-    if (!lineBox) {
+    bool isValid;
+    nsBlockInFlowLineIterator iter(blockFrame, aPlaceholderFrame, &isValid);
+    if (!isValid) {
       // Give up.  We're probably dealing with somebody using
       // position:absolute inside native-anonymous content anyway.
       aHypotheticalBox.mTop = placeholderOffset.y;
     } else {
+      NS_ASSERTION(iter.GetContainer() == blockFrame,
+                   "Found placeholder in wrong block!");
+      nsBlockFrame::line_iterator lineBox = iter.GetLine();
+
       // How we determine the hypothetical box depends on whether the element
       // would have been inline-level or block-level
       if (mStyleDisplay->IsOriginalDisplayInlineOutside()) {
@@ -953,10 +956,10 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsPresContext*    aPresContext,
         // have been just before this line.
         // XXXbz the line box is not fully reflowed yet if our
         // containing block is relatively positioned...
-        bool allEmpty = true;
-        if (!lineBox->IsValidCachedIsEmpty() || !lineBox->CachedIsEmpty()) {
+        if (lineBox != iter.End()) {
           nsIFrame * firstFrame = lineBox->mFirstChild;
           bool found = false;
+          bool allEmpty = true;
           while (firstFrame) { // See bug 223064
             allEmpty = AreAllEarlierInFlowFramesEmpty(firstFrame,
               aPlaceholderFrame, &found);
@@ -965,17 +968,20 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsPresContext*    aPresContext,
             firstFrame = firstFrame->GetNextSibling();
           }
           NS_ASSERTION(firstFrame, "Couldn't find placeholder!");
-        }
 
-        if (allEmpty) {
-          // The top of the hypothetical box is the top of the line
-          // containing the placeholder, since there is nothing in the
-          // line before our placeholder except empty frames.
-          aHypotheticalBox.mTop = lineBox->mBounds.y + blockYOffset;
+          if (allEmpty) {
+            // The top of the hypothetical box is the top of the line
+            // containing the placeholder, since there is nothing in the
+            // line before our placeholder except empty frames.
+            aHypotheticalBox.mTop = lineBox->mBounds.y + blockYOffset;
+          } else {
+            // The top of the hypothetical box is just below the line
+            // containing the placeholder.
+            aHypotheticalBox.mTop = lineBox->mBounds.YMost() + blockYOffset;
+          }
         } else {
-          // The top of the hypothetical box is just below the line
-          // containing the placeholder.
-          aHypotheticalBox.mTop = lineBox->mBounds.YMost() + blockYOffset;
+          // Just use the placeholder's y-offset wrt the containing block
+          aHypotheticalBox.mTop = placeholderOffset.y;
         }
       }
     }
@@ -1101,10 +1107,9 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsPresContext* aPresContext,
                "Why are we here?");
 
   // Get the placeholder frame
-  nsPlaceholderFrame*     placeholderFrame;
+  nsIFrame*     placeholderFrame;
 
-  placeholderFrame =
-    aPresContext->PresShell()->FrameManager()->GetPlaceholderFrameFor(frame);
+  placeholderFrame = aPresContext->PresShell()->GetPlaceholderFrameFor(frame);
   NS_ASSERTION(nsnull != placeholderFrame, "no placeholder frame");
 
   // If both 'left' and 'right' are 'auto' or both 'top' and 'bottom' are
diff --git a/layout/generic/nsHTMLReflowState.h b/layout/generic/nsHTMLReflowState.h
index 3f0cdb09d96..5b9281c072a 100644
--- a/layout/generic/nsHTMLReflowState.h
+++ b/layout/generic/nsHTMLReflowState.h
@@ -49,7 +49,6 @@ class nsRenderingContext;
 class nsFloatManager;
 class nsLineLayout;
 class nsIPercentHeightObserver;
-class nsPlaceholderFrame;
 
 struct nsStyleDisplay;
 struct nsStyleVisibility;
@@ -512,7 +511,7 @@ protected:
                                         nscoord& aCBWidth);
 
   void CalculateHypotheticalBox(nsPresContext*    aPresContext,
-                                nsPlaceholderFrame* aPlaceholderFrame,
+                                nsIFrame*         aPlaceholderFrame,
                                 nsIFrame*         aContainingBlock,
                                 nscoord           aBlockLeftContentEdge,
                                 nscoord           aBlockContentWidth,
diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp
index f8542387d0d..6e4010c8c62 100644
--- a/layout/generic/nsLineBox.cpp
+++ b/layout/generic/nsLineBox.cpp
@@ -289,7 +289,7 @@ nsLineBox::IsEmpty() const
 }
 
 bool
-nsLineBox::CachedIsEmpty() const
+nsLineBox::CachedIsEmpty()
 {
   if (mFlags.mDirty) {
     return IsEmpty();
diff --git a/layout/generic/nsLineBox.h b/layout/generic/nsLineBox.h
index 369c73858d5..82c63ff5caf 100644
--- a/layout/generic/nsLineBox.h
+++ b/layout/generic/nsLineBox.h
@@ -486,14 +486,14 @@ public:
   // Call this only while in Reflow() for the block the line belongs
   // to, only between reflowing the line (or sliding it, if we skip
   // reflowing it) and the end of reflowing the block.
-  bool CachedIsEmpty() const;
+  bool CachedIsEmpty();
 
   void InvalidateCachedIsEmpty() {
     mFlags.mEmptyCacheValid = false;
   }
 
   // For debugging purposes
-  bool IsValidCachedIsEmpty() const {
+  bool IsValidCachedIsEmpty() {
     return mFlags.mEmptyCacheValid;
   }
 
@@ -514,8 +514,8 @@ public:
     PRUint32 mLineWrapped: 1;
     PRUint32 mInvalidateTextRuns : 1;
     PRUint32 mResizeReflowOptimizationDisabled: 1;  // default 0 = means that the opt potentially applies to this line. 1 = never skip reflowing this line for a resize reflow
-    mutable PRUint32 mEmptyCacheValid: 1;
-    mutable PRUint32 mEmptyCacheState: 1;
+    PRUint32 mEmptyCacheValid: 1;
+    PRUint32 mEmptyCacheState: 1;
     // mHasBullet indicates that this is an inline line whose block's
     // bullet is adjacent to this line and non-empty.
     PRUint32 mHasBullet : 1;
diff --git a/layout/generic/nsPlaceholderFrame.cpp b/layout/generic/nsPlaceholderFrame.cpp
index c86bcc9a9fa..6e7ec72759e 100644
--- a/layout/generic/nsPlaceholderFrame.cpp
+++ b/layout/generic/nsPlaceholderFrame.cpp
@@ -145,15 +145,6 @@ nsPlaceholderFrame::Reflow(nsPresContext*          aPresContext,
   aDesiredSize.width = 0;
   aDesiredSize.height = 0;
 
-  // Cache our line box.
-  mCachedLineBox = nsnull;
-  if (aReflowState.mLineLayout) {
-    nsLineList::iterator* line = aReflowState.mLineLayout->GetLine();
-    if (line) {
-      mCachedLineBox = line->get();
-    }
-  }
-
   aStatus = NS_FRAME_COMPLETE;
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
   return NS_OK;
diff --git a/layout/generic/nsPlaceholderFrame.h b/layout/generic/nsPlaceholderFrame.h
index 82e5c4e0246..e53d44e5af0 100644
--- a/layout/generic/nsPlaceholderFrame.h
+++ b/layout/generic/nsPlaceholderFrame.h
@@ -69,8 +69,6 @@
 #include "nsFrame.h"
 #include "nsGkAtoms.h"
 
-class nsLineBox;
-
 nsIFrame* NS_NewPlaceholderFrame(nsIPresShell* aPresShell,
                                  nsStyleContext* aContext,
                                  nsFrameState aTypeBit);
@@ -202,17 +200,8 @@ public:
     return outOfFlow;
   }
 
-  // GetCachedLineBox is only OK to call if you're sure this
-  // placeholder has has Reflow() called since any changes to the
-  // frame tree that could have affected which line box the
-  // placeholder is in.
-  const nsLineBox* GetCachedLineBox() const {
-    return mCachedLineBox;
-  }
-
 protected:
   nsIFrame* mOutOfFlowFrame;
-  nsLineBox* mCachedLineBox;
 };
 
 #endif /* nsPlaceholderFrame_h___ */
diff --git a/layout/inspector/public/inIDOMUtils.idl b/layout/inspector/public/inIDOMUtils.idl
index 9445719cec6..d245785036b 100644
--- a/layout/inspector/public/inIDOMUtils.idl
+++ b/layout/inspector/public/inIDOMUtils.idl
@@ -49,13 +49,16 @@ interface nsIDOMNodeList;
 interface nsIDOMFontFaceList;
 interface nsIDOMRange;
 
-[scriptable, uuid(70205D9E-EFD7-4658-8E9E-690400B57FD0)]
+[scriptable, uuid(0D9E5532-F5D5-44DD-94CA-D9EED5778B1C)]
 interface inIDOMUtils : nsISupports
 {
   // CSS utilities
   nsISupportsArray getCSSStyleRules(in nsIDOMElement aElement, [optional] in DOMString aPseudo);
   unsigned long getRuleLine(in nsIDOMCSSStyleRule aRule);
 
+  // Returns true if the string names a property that is inherited by default.
+  bool isInheritedProperty(in AString aPropertyName);
+
   // DOM Node utilities
   boolean isIgnorableWhitespace(in nsIDOMCharacterData aDataNode);
   // Returns the "parent" of a node.  The parent of a document node is the
diff --git a/layout/inspector/src/inDOMUtils.cpp b/layout/inspector/src/inDOMUtils.cpp
index df5de07e888..2e29a9d8d37 100644
--- a/layout/inspector/src/inDOMUtils.cpp
+++ b/layout/inspector/src/inDOMUtils.cpp
@@ -244,6 +244,24 @@ inDOMUtils::GetRuleLine(nsIDOMCSSStyleRule *aRule, PRUint32 *_retval)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+inDOMUtils::IsInheritedProperty(const nsAString &aPropertyName, bool *_retval)
+{
+  nsCSSProperty prop = nsCSSProps::LookupProperty(aPropertyName);
+  if (prop == eCSSProperty_UNKNOWN) {
+    *_retval = false;
+    return NS_OK;
+  }
+
+  if (nsCSSProps::IsShorthand(prop)) {
+    prop = nsCSSProps::SubpropertyEntryFor(prop)[0];
+  }
+
+  nsStyleStructID sid = nsCSSProps::kSIDTable[prop];
+  *_retval = !nsCachedStyleData::IsReset(sid);
+  return NS_OK;
+}
+
 NS_IMETHODIMP 
 inDOMUtils::GetBindingURLs(nsIDOMElement *aElement, nsIArray **_retval)
 {
diff --git a/layout/inspector/tests/Makefile.in b/layout/inspector/tests/Makefile.in
index 72e958cb695..d8ad5716ac3 100644
--- a/layout/inspector/tests/Makefile.in
+++ b/layout/inspector/tests/Makefile.in
@@ -52,6 +52,7 @@ _TEST_FILES =\
 		test_bug536379-2.html \
 		test_bug557726.html \
 		test_bug609549.xhtml \
+		test_isinheritableproperty.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/layout/inspector/tests/test_isinheritableproperty.html b/layout/inspector/tests/test_isinheritableproperty.html
new file mode 100644
index 00000000000..2b5e3b77e9d
--- /dev/null
+++ b/layout/inspector/tests/test_isinheritableproperty.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=699592
+-->
+<head>
+  <title>Test for nsIDOMUtils::isInheritedProperty</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+
+function do_test() {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  var utils = Components.classes["@mozilla.org/inspector/dom-utils;1"]
+    .getService(Components.interfaces.inIDOMUtils);
+
+  is(utils.isInheritedProperty("font-size"), true, "font-size is inherited.");
+
+  is(utils.isInheritedProperty("min-width"), false, "min-width is not inherited.");
+
+  is(utils.isInheritedProperty("font"), true, "shorthand font property is inherited.");
+
+  is(utils.isInheritedProperty("border"), false, "shorthand border property not inherited.");
+  is(utils.isInheritedProperty("garbage"), false, "Unknown property isn't inherited.");
+
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(do_test);
+
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/style/nsDOMCSSAttrDeclaration.cpp b/layout/style/nsDOMCSSAttrDeclaration.cpp
index 70f44d54d96..ac9a50ee851 100644
--- a/layout/style/nsDOMCSSAttrDeclaration.cpp
+++ b/layout/style/nsDOMCSSAttrDeclaration.cpp
@@ -53,15 +53,10 @@
 namespace css = mozilla::css;
 namespace dom = mozilla::dom;
 
-nsDOMCSSAttributeDeclaration::nsDOMCSSAttributeDeclaration(dom::Element* aElement
-#ifdef MOZ_SMIL
-                                                           , bool aIsSMILOverride
-#endif // MOZ_SMIL
-                                                           )
+nsDOMCSSAttributeDeclaration::nsDOMCSSAttributeDeclaration(dom::Element* aElement,
+                                                           bool aIsSMILOverride)
   : mElement(aElement)
-#ifdef MOZ_SMIL
   , mIsSMILOverride(aIsSMILOverride)
-#endif // MOZ_SMIL
 {
   MOZ_COUNT_CTOR(nsDOMCSSAttributeDeclaration);
 
@@ -88,9 +83,7 @@ nsDOMCSSAttributeDeclaration::SetCSSDeclaration(css::Declaration* aDecl)
 {
   NS_ASSERTION(mElement, "Must have Element to set the declaration!");
   css::StyleRule* oldRule =
-#ifdef MOZ_SMIL
     mIsSMILOverride ? mElement->GetSMILOverrideStyleRule() :
-#endif // MOZ_SMIL
     mElement->GetInlineStyleRule();
   NS_ASSERTION(oldRule, "Element must have rule");
 
@@ -101,9 +94,7 @@ nsDOMCSSAttributeDeclaration::SetCSSDeclaration(css::Declaration* aDecl)
   }
 
   return
-#ifdef MOZ_SMIL
     mIsSMILOverride ? mElement->SetSMILOverrideStyleRule(newRule, true) :
-#endif // MOZ_SMIL
     mElement->SetInlineStyleRule(newRule, true);
 }
 
@@ -114,10 +105,7 @@ nsDOMCSSAttributeDeclaration::DocToUpdate()
   // BeginUpdate(), but this is a good chokepoint where we know we
   // plan to modify the CSSDeclaration, so need to notify
   // AttributeWillChange if this is inline style.
-#ifdef MOZ_SMIL
-  if (!mIsSMILOverride)
-#endif
-  {
+  if (!mIsSMILOverride) {
     nsNodeUtils::AttributeWillChange(mElement, kNameSpaceID_None,
                                      nsGkAtoms::style,
                                      nsIDOMMutationEvent::MODIFICATION);
@@ -135,11 +123,9 @@ nsDOMCSSAttributeDeclaration::GetCSSDeclaration(bool aAllocate)
     return nsnull;
 
   css::StyleRule* cssRule;
-#ifdef MOZ_SMIL
   if (mIsSMILOverride)
     cssRule = mElement->GetSMILOverrideStyleRule();
   else
-#endif // MOZ_SMIL
     cssRule = mElement->GetInlineStyleRule();
 
   if (cssRule) {
@@ -156,11 +142,9 @@ nsDOMCSSAttributeDeclaration::GetCSSDeclaration(bool aAllocate)
 
   // this *can* fail (inside SetAttrAndNotify, at least).
   nsresult rv;
-#ifdef MOZ_SMIL
   if (mIsSMILOverride)
     rv = mElement->SetSMILOverrideStyleRule(newRule, false);
   else
-#endif // MOZ_SMIL
     rv = mElement->SetInlineStyleRule(newRule, false);
 
   if (NS_FAILED(rv)) {
diff --git a/layout/style/nsDOMCSSAttrDeclaration.h b/layout/style/nsDOMCSSAttrDeclaration.h
index fb692839fc4..fbe96390ad9 100644
--- a/layout/style/nsDOMCSSAttrDeclaration.h
+++ b/layout/style/nsDOMCSSAttrDeclaration.h
@@ -62,11 +62,7 @@ class nsDOMCSSAttributeDeclaration : public nsDOMCSSDeclaration,
 {
 public:
   typedef mozilla::dom::Element Element;
-  nsDOMCSSAttributeDeclaration(Element* aContent
-#ifdef MOZ_SMIL
-                               , bool aIsSMILOverride
-#endif // MOZ_SMIL
-                               );
+  nsDOMCSSAttributeDeclaration(Element* aContent, bool aIsSMILOverride);
   ~nsDOMCSSAttributeDeclaration();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -87,13 +83,11 @@ protected:
 
   nsRefPtr<Element> mElement;
 
-#ifdef MOZ_SMIL
   /* If true, this indicates that this nsDOMCSSAttributeDeclaration
    * should interact with mContent's SMIL override style rule (rather
    * than the inline style rule).
    */
   const bool mIsSMILOverride;
-#endif // MOZ_SMIL
 };
 
 #endif /* nsDOMCSSAttributeDeclaration_h */
diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index a96475b7add..8877e5383ec 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -81,7 +81,6 @@ nsHTMLCSSStyleSheet::RulesMatching(ElementRuleProcessorData* aData)
     aData->mRuleWalker->Forward(rule);
   }
 
-#ifdef MOZ_SMIL
   rule = element->GetSMILOverrideStyleRule();
   if (rule) {
     if (aData->mPresContext->IsProcessingRestyles() &&
@@ -98,7 +97,6 @@ nsHTMLCSSStyleSheet::RulesMatching(ElementRuleProcessorData* aData)
       aData->mRuleWalker->Forward(rule);
     }
   }
-#endif // MOZ_SMIL
 }
 
 /* virtual */ void
diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
index 877fd154e27..efc9b066ded 100644
--- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
@@ -337,8 +337,8 @@ nsSVGOuterSVGFrame::ComputeSize(nsRenderingContext *aRenderingContext,
 
       nsSVGLength2 &height =
         content->mLengthAttributes[nsSVGSVGElement::HEIGHT];
-      NS_ABORT_IF_FALSE(aCBSize.height != NS_AUTOHEIGHT,
-                        "root should not have auto-height containing block");
+      NS_ASSERTION(aCBSize.height != NS_AUTOHEIGHT,
+                   "root should not have auto-height containing block");
       if (height.IsPercentage()) {
         NS_ABORT_IF_FALSE(intrinsicSize.height.GetUnit() == eStyleUnit_None,
                           "GetIntrinsicSize should have reported no "
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index 40f4f659a78..4e94208dfc9 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -166,12 +166,9 @@ static const PRUint8 gsRGBToLinearRGBMap[256] = {
 239, 242, 244, 246, 248, 250, 253, 255
 };
 
-#ifdef MOZ_SMIL
 static bool gSMILEnabled;
 static const char SMIL_PREF_STR[] = "svg.smil.enabled";
-#endif // MOZ_SMIL
 
-#ifdef MOZ_SMIL
 static int
 SMILPrefChanged(const char *aPref, void *aClosure)
 {
@@ -195,7 +192,6 @@ NS_SMILEnabled()
 
   return gSMILEnabled;
 }
-#endif // MOZ_SMIL
 
 nsSVGSVGElement*
 nsSVGUtils::GetOuterSVGElement(nsSVGElement *aSVGElement)
diff --git a/layout/svg/base/src/nsSVGUtils.h b/layout/svg/base/src/nsSVGUtils.h
index 7e7f621a912..9dafbd628b5 100644
--- a/layout/svg/base/src/nsSVGUtils.h
+++ b/layout/svg/base/src/nsSVGUtils.h
@@ -139,13 +139,11 @@ IsSVGWhitespace(PRUnichar aChar)
          aChar == PRUnichar('\xD')  || aChar == PRUnichar('\xA');
 }
 
-#ifdef MOZ_SMIL
 /*
  * Checks the smil enabled preference.  Declared as a function to match
  * NS_SVGEnabled().
  */
 bool NS_SMILEnabled();
-#endif // MOZ_SMIL
 
 // GRRR WINDOWS HATE HATE HATE
 #undef CLIP_MASK
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index c791012ddfd..f323f9ebcb0 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -1389,8 +1389,8 @@ nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
           // Crop right.
           nscoord cwidth;
           nscoord twidth = 0;
-          int length = aText.Length();
-          int i;
+          PRUint32 length = aText.Length();
+          PRUint32 i;
           for (i = 0; i < length; ++i) {
             PRUnichar ch = aText[i];
             // XXX this is horrible and doesn't handle clusters
@@ -1408,8 +1408,8 @@ nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
           // Crop left.
           nscoord cwidth;
           nscoord twidth = 0;
-          int length = aText.Length();
-          int i;
+          PRInt32 length = aText.Length();
+          PRInt32 i;
           for (i=length-1; i >= 0; --i) {
             PRUnichar ch = aText[i];
             cwidth = aRenderingContext.GetWidth(ch);
@@ -1430,9 +1430,9 @@ nsTreeBodyFrame::AdjustForCellText(nsAutoString& aText,
           // Crop center.
           nsAutoString leftStr, rightStr;
           nscoord cwidth, twidth = 0;
-          int length = aText.Length();
-          int rightPos = length - 1;
-          for (int leftPos = 0; leftPos < rightPos; ++leftPos) {
+          PRInt32 length = aText.Length();
+          PRInt32 rightPos = length - 1;
+          for (PRInt32 leftPos = 0; leftPos < rightPos; ++leftPos) {
             PRUnichar ch = aText[leftPos];
             cwidth = aRenderingContext.GetWidth(ch);
             twidth += cwidth;
diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
index 85c15803cf6..f676fb45852 100644
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -6073,8 +6073,13 @@ MALLOC_OUT:
 			    default_zone->version == LION_MALLOC_ZONE_T_VERSION);
 
 	/* Allow us dynamically turn off jemalloc for testing. */
-	if (getenv("NO_MAC_JEMALLOC"))
+	if (getenv("NO_MAC_JEMALLOC")) {
 		osx_use_jemalloc = false;
+#ifdef __i386__
+		malloc_printf("Warning: NO_MAC_JEMALLOC has no effect on "
+			      "i386 machines (such as this one).\n");
+#endif
+	}
 
 	if (osx_use_jemalloc) {
 		/*
@@ -6175,8 +6180,11 @@ wrap(strdup)(const char *src) {
  * allocators, we need to call the OSX allocators from the functions below,
  * when osx_use_jemalloc is not (dynamically) set.
  *
- * memalign is unavailable on Leopard, so we can't dynamically do this there.
- * However, we don't use jemalloc on Leopard, so we can ignore this.
+ * Note that we assume jemalloc is enabled on i386.  This is safe because the
+ * only i386 versions of MacOS are 10.5 and 10.6, which we support.  We have to
+ * do this because madvise isn't in the malloc zone struct for 10.5.
+ *
+ * This means that NO_MAC_JEMALLOC doesn't work on i386.
  */
 #if defined(MOZ_MEMORY_DARWIN) && !defined(__i386__)
 #define DARWIN_ONLY(A) if (!osx_use_jemalloc) { A; }
diff --git a/mobile/chrome/content/BookmarkPopup.js b/mobile/chrome/content/BookmarkPopup.js
index 2407c80370e..451dbf29715 100644
--- a/mobile/chrome/content/BookmarkPopup.js
+++ b/mobile/chrome/content/BookmarkPopup.js
@@ -47,6 +47,13 @@ var BookmarkPopup = {
     this.hide();
 
     let browser = getBrowser();
-    Util.createShortcut(browser.contentTitle, browser.currentURI.spec, browser.mIconURL, "bookmark");
+    let itemId = PlacesUtils.getMostRecentBookmarkForURI(browser.currentURI);
+    let title = "";
+    if (itemId == -1)
+      title = browser.contentTitle;
+    else
+      title = PlacesUtils.bookmarks.getItemTitle(itemId);
+
+    Util.createShortcut(title, browser.currentURI.spec, browser.mIconURL, "bookmark");
   }
 };
diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in
index 70d82341506..37a0cbd945c 100644
--- a/mobile/chrome/tests/Makefile.in
+++ b/mobile/chrome/tests/Makefile.in
@@ -58,8 +58,8 @@ _BROWSER_FILES = \
   browser_addons.js \
   browser_addons_locales.js \
   browser_appmenu.js \
-  browser_autocompletesearch.js\
-  browser_awesomescreen.js \
+  browser_autocompletesearch.js \
+  $(info browser_awesomescreen.js is disabled because the localepicker is disabled (bug 693524)) \
   browser_blank_01.html \
   browser_blank_02.html \
   browser_blank_03.html \
diff --git a/mobile/installer/package-manifest.in b/mobile/installer/package-manifest.in
index 367653a9e5c..626901d1c79 100644
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -303,8 +303,6 @@
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/nsSearchService.js
 @BINPATH@/components/nsSearchSuggestions.js
-@BINPATH@/components/nsTryToClose.manifest
-@BINPATH@/components/nsTryToClose.js
 @BINPATH@/components/passwordmgr.manifest
 @BINPATH@/components/nsLoginInfo.js
 @BINPATH@/components/nsLoginManager.js
@@ -513,9 +511,7 @@
 ; svg
 @BINPATH@/res/svg.css
 @BINPATH@/components/dom_svg.xpt
-#ifdef MOZ_SMIL
 @BINPATH@/components/dom_smil.xpt
-#endif
 
 ; [Personal Security Manager]
 ;
diff --git a/mobile/installer/removed-files.in b/mobile/installer/removed-files.in
index 9aa1a4bf996..25a1e83f6e2 100644
--- a/mobile/installer/removed-files.in
+++ b/mobile/installer/removed-files.in
@@ -1,4 +1,5 @@
 README.txt
+components/nsTryToClose.js
 #if MOZ_UPDATE_CHANNEL != beta
 extensions/feedback@mobile.mozilla.org.xpi
 #endif
diff --git a/mobile/themes/core/honeycomb/defines.inc b/mobile/themes/core/honeycomb/defines.inc
index 70e3dccab81..309a6c82480 100644
--- a/mobile/themes/core/honeycomb/defines.inc
+++ b/mobile/themes/core/honeycomb/defines.inc
@@ -35,6 +35,7 @@
 %define color_background_settings #efefef
 %define color_text_panel_header #999
 %define color_text_panel_subheader #333
+%define color_background_toaster #000
 
 %define color_background_highlight #a7c5f4
 %define color_background_highlight_overlay rgba(167, 197, 244, 0.8)
@@ -69,6 +70,7 @@
 %define touch_button_minwidth 11.86mozmm
 %define touch_normal 6.77mozmm
 
+%define margin_toaster 15.24mozmm
 %define margin_context_popup 3.39mozmm
 %define margin_xlarge 3.39mozmm
 %define margin_large 2.54mozmm
diff --git a/modules/libpref/public/Preferences.h b/modules/libpref/public/Preferences.h
index aa2cce97597..ad356efae94 100644
--- a/modules/libpref/public/Preferences.h
+++ b/modules/libpref/public/Preferences.h
@@ -369,7 +369,7 @@ private:
   /**
    * Init static members.  TRUE if it succeeded.  Otherwise, FALSE.
    */
-  static bool InitStaticMembers(bool aForService = false);
+  static bool InitStaticMembers();
 };
 
 } // namespace mozilla
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
index 45833c7fa64..c2bceeb7fa7 100644
--- a/modules/libpref/src/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp
@@ -203,29 +203,6 @@ Preferences::GetInstanceForService()
 
   NS_ENSURE_TRUE(!sShutdown, nsnull);
 
-  InitStaticMembers(true);
-  NS_IF_ADDREF(sPreferences);
-  return sPreferences;
-}
-
-// static
-bool
-Preferences::InitStaticMembers(bool aForService)
-{
-  if (sShutdown || sPreferences) {
-    return sPreferences != nsnull;
-  }
-
-  // If InitStaticMembers() isn't called for getting nsIPrefService,
-  // some global components needed by Preferences::Init() may not have been
-  // initialized yet.  Therefore, we must create the singleton instance via
-  // service manager.
-  if (!aForService) {
-    nsCOMPtr<nsIPrefService> prefService =
-      do_GetService(NS_PREFSERVICE_CONTRACTID);
-    return sPreferences != nsnull;
-  }
-
   sRootBranch = new nsPrefBranch("", false);
   NS_ADDREF(sRootBranch);
   sDefaultRootBranch = new nsPrefBranch("", true);
@@ -237,7 +214,7 @@ Preferences::InitStaticMembers(bool aForService)
   if (NS_FAILED(sPreferences->Init())) {
     // The singleton instance will delete sRootBranch and sDefaultRootBranch.
     NS_RELEASE(sPreferences);
-    return false;
+    return nsnull;
   }
 
   gCacheData = new nsTArray<nsAutoPtr<CacheData> >();
@@ -245,14 +222,27 @@ Preferences::InitStaticMembers(bool aForService)
   gObserverTable = new nsRefPtrHashtable<ValueObserverHashKey, ValueObserver>();
   gObserverTable->Init();
 
-  return true;
+  NS_ADDREF(sPreferences);
+  return sPreferences;
+}
+
+// static
+bool
+Preferences::InitStaticMembers()
+{
+  if (!sShutdown && !sPreferences) {
+    nsCOMPtr<nsIPrefService> prefService =
+      do_GetService(NS_PREFSERVICE_CONTRACTID);
+  }
+
+  return sPreferences != nsnull;
 }
 
 // static
 void
 Preferences::Shutdown()
 {
-  if (!sShutdown ) {
+  if (!sShutdown) {
     sShutdown = true; // Don't create the singleton instance after here.
 
     // Don't set NULL to sPreferences here.  The instance may be grabbed by
@@ -348,7 +338,7 @@ Preferences::Init()
    * category which will do the rest.
    */
 
-  rv = sRootBranch->GetCharPref("general.config.filename", getter_Copies(lockFileName));
+  rv = PREF_CopyCharPref("general.config.filename", getter_Copies(lockFileName), false);
   if (NS_SUCCEEDED(rv))
     NS_CreateServicesFromCategory("pref-config-startup",
                                   static_cast<nsISupports *>(static_cast<void *>(this)),
@@ -1129,7 +1119,7 @@ Preferences::GetBool(const char* aPref, bool* aResult)
 {
   NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sRootBranch->GetBoolPref(aPref, aResult);
+  return PREF_GetBoolPref(aPref, aResult, false);
 }
 
 // static
@@ -1138,7 +1128,7 @@ Preferences::GetInt(const char* aPref, PRInt32* aResult)
 {
   NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sRootBranch->GetIntPref(aPref, aResult);
+  return PREF_GetIntPref(aPref, aResult, false);
 }
 
 // static
@@ -1146,7 +1136,7 @@ nsAdoptingCString
 Preferences::GetCString(const char* aPref)
 {
   nsAdoptingCString result;
-  GetCString(aPref, &result);
+  PREF_CopyCharPref(aPref, getter_Copies(result), false);
   return result;
 }
 
@@ -1166,7 +1156,7 @@ Preferences::GetCString(const char* aPref, nsACString* aResult)
   NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
   nsCAutoString result;
-  nsresult rv = sRootBranch->GetCharPref(aPref, getter_Copies(result));
+  nsresult rv = PREF_CopyCharPref(aPref, getter_Copies(result), false);
   if (NS_SUCCEEDED(rv)) {
     *aResult = result;
   }
@@ -1180,7 +1170,7 @@ Preferences::GetString(const char* aPref, nsAString* aResult)
   NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
   nsCAutoString result;
-  nsresult rv = sRootBranch->GetCharPref(aPref, getter_Copies(result));
+  nsresult rv = PREF_CopyCharPref(aPref, getter_Copies(result), false);
   if (NS_SUCCEEDED(rv)) {
     CopyUTF8toUTF16(result, *aResult);
   }
@@ -1247,47 +1237,54 @@ Preferences::GetComplex(const char* aPref, const nsIID &aType, void** aResult)
 nsresult
 Preferences::SetCString(const char* aPref, const char* aValue)
 {
+  NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE);
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sRootBranch->SetCharPref(aPref, aValue);
+  return PREF_SetCharPref(aPref, aValue, false);
 }
 
 // static
 nsresult
 Preferences::SetCString(const char* aPref, const nsACString &aValue)
 {
-  return SetCString(aPref, PromiseFlatCString(aValue).get());
+  NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE);
+  NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
+  return PREF_SetCharPref(aPref, PromiseFlatCString(aValue).get(), false);
 }
 
 // static
 nsresult
 Preferences::SetString(const char* aPref, const PRUnichar* aValue)
 {
-  NS_ConvertUTF16toUTF8 utf8(aValue);
-  return SetCString(aPref, utf8.get());
+  NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE);
+  NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
+  return PREF_SetCharPref(aPref, NS_ConvertUTF16toUTF8(aValue).get(), false);
 }
 
 // static
 nsresult
 Preferences::SetString(const char* aPref, const nsAString &aValue)
 {
-  NS_ConvertUTF16toUTF8 utf8(aValue);
-  return SetCString(aPref, utf8.get());
+  NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE);
+  NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
+  return PREF_SetCharPref(aPref, NS_ConvertUTF16toUTF8(aValue).get(), false);
 }
 
 // static
 nsresult
 Preferences::SetBool(const char* aPref, bool aValue)
 {
+  NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE);
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sRootBranch->SetBoolPref(aPref, aValue);
+  return PREF_SetBoolPref(aPref, aValue, false);
 }
 
 // static
 nsresult
 Preferences::SetInt(const char* aPref, PRInt32 aValue)
 {
+  NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE);
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sRootBranch->SetIntPref(aPref, aValue);
+  return PREF_SetIntPref(aPref, aValue, false);
 }
 
 // static
@@ -1303,8 +1300,9 @@ Preferences::SetComplex(const char* aPref, const nsIID &aType,
 nsresult
 Preferences::ClearUser(const char* aPref)
 {
+  NS_ENSURE_TRUE(XRE_GetProcessType() == GeckoProcessType_Default, NS_ERROR_NOT_AVAILABLE);
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sRootBranch->ClearUserPref(aPref);
+  return PREF_ClearUserPref(aPref);
 }
 
 // static
@@ -1312,12 +1310,7 @@ bool
 Preferences::HasUserValue(const char* aPref)
 {
   NS_ENSURE_TRUE(InitStaticMembers(), false);
-  bool hasUserValue;
-  nsresult rv = sRootBranch->PrefHasUserValue(aPref, &hasUserValue);
-  if (NS_FAILED(rv)) {
-    return false;
-  }
-  return hasUserValue;
+  return PREF_HasUserPref(aPref);
 }
 
 // static
@@ -1514,25 +1507,28 @@ Preferences::AddUintVarCache(PRUint32* aCache,
 nsresult
 Preferences::GetDefaultBool(const char* aPref, bool* aResult)
 {
+  NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sDefaultRootBranch->GetBoolPref(aPref, aResult);
+  return PREF_GetBoolPref(aPref, aResult, true);
 }
 
 // static
 nsresult
 Preferences::GetDefaultInt(const char* aPref, PRInt32* aResult)
 {
+  NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  return sDefaultRootBranch->GetIntPref(aPref, aResult);
+  return PREF_GetIntPref(aPref, aResult, true);
 }
 
 // static
 nsresult
 Preferences::GetDefaultCString(const char* aPref, nsACString* aResult)
 {
+  NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
   nsCAutoString result;
-  nsresult rv = sDefaultRootBranch->GetCharPref(aPref, getter_Copies(result));
+  nsresult rv = PREF_CopyCharPref(aPref, getter_Copies(result), true);
   if (NS_SUCCEEDED(rv)) {
     *aResult = result;
   }
@@ -1543,9 +1539,10 @@ Preferences::GetDefaultCString(const char* aPref, nsACString* aResult)
 nsresult
 Preferences::GetDefaultString(const char* aPref, nsAString* aResult)
 {
+  NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
   nsCAutoString result;
-  nsresult rv = sDefaultRootBranch->GetCharPref(aPref, getter_Copies(result));
+  nsresult rv = PREF_CopyCharPref(aPref, getter_Copies(result), true);
   if (NS_SUCCEEDED(rv)) {
     CopyUTF8toUTF16(result, *aResult);
   }
@@ -1597,7 +1594,7 @@ nsAdoptingCString
 Preferences::GetDefaultCString(const char* aPref)
 {
   nsAdoptingCString result;
-  GetDefaultCString(aPref, &result);
+  PREF_CopyCharPref(aPref, getter_Copies(result), true);
   return result;
 }
 
diff --git a/parser/html/nsHtml5TokenizerCppSupplement.h b/parser/html/nsHtml5TokenizerCppSupplement.h
index 45542c59abe..036a4be5003 100644
--- a/parser/html/nsHtml5TokenizerCppSupplement.h
+++ b/parser/html/nsHtml5TokenizerCppSupplement.h
@@ -176,10 +176,10 @@ nsHtml5Tokenizer::errNcrNonCharacter(PRUnichar ch)
 }
 
 void
-nsHtml5Tokenizer::errAstralNonCharacter(int ch)
+nsHtml5Tokenizer::errAstralNonCharacter(PRInt32 ch)
 {
   if (NS_UNLIKELY(mViewSource)) {
-    mViewSource->AddErrorToCurrentNode("errAstralNonCharacter");
+    mViewSource->AddErrorToCurrentNode("errNcrNonCharacter");
   }
 }
 
diff --git a/parser/html/nsHtml5TreeBuilderCppSupplement.h b/parser/html/nsHtml5TreeBuilderCppSupplement.h
index c108106292f..6a2634161e2 100644
--- a/parser/html/nsHtml5TreeBuilderCppSupplement.h
+++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h
@@ -730,7 +730,7 @@ void
 nsHtml5TreeBuilder::errStrayStartTag(nsIAtom* aName)
 {
   if (NS_UNLIKELY(mViewSource)) {
-    mViewSource->AddErrorToCurrentRun("errStrayStartTag", aName);
+    mViewSource->AddErrorToCurrentRun("errStrayStartTag2", aName);
   }
 }
 
@@ -884,7 +884,7 @@ void
 nsHtml5TreeBuilder::errBadStartTagInHead(nsIAtom* aName)
 {
   if (NS_UNLIKELY(mViewSource)) {
-    mViewSource->AddErrorToCurrentRun("errBadStartTagInHead", aName);
+    mViewSource->AddErrorToCurrentRun("errBadStartTagInHead2", aName);
   }
 }
 
diff --git a/security/manager/ssl/src/nsSmartCardEvent.cpp b/security/manager/ssl/src/nsSmartCardEvent.cpp
index 8edf4a3153d..eeee5c24c89 100644
--- a/security/manager/ssl/src/nsSmartCardEvent.cpp
+++ b/security/manager/ssl/src/nsSmartCardEvent.cpp
@@ -232,6 +232,12 @@ NS_IMETHODIMP nsSmartCardEvent::StopPropagation()
   return mInner->StopPropagation();
 }
 
+NS_IMETHODIMP nsSmartCardEvent::StopImmediatePropagation()
+{
+  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
+  return mInner->StopImmediatePropagation();
+}
+
 NS_IMETHODIMP nsSmartCardEvent::PreventDefault()
 {
   NS_ASSERTION(mInner, "SmartCardEvent called without Init");
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index 3bbdde29e06..e5aed96303b 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.79 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
@@ -1075,6 +1075,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_338 [] = {
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_339 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
 };
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_340 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_341 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_342 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_343 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
 #ifdef DEBUG
 static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -1083,7 +1095,7 @@ static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"CVS ID", (PRUint32)7 },
   { (void *)"NSS", (PRUint32)4 },
-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.82 $ $Date: 2011/09/02 19:40:56 $", (PRUint32)160 }
+  { (void *)"@(#) $RCSfile: certdata.txt,v $ $Revision: 1.79 $ $Date: 2011/09/02 19:40:56 $""; @(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $", (PRUint32)160 }
 };
 #endif /* DEBUG */
 static const NSSItem nss_builtins_items_1 [] = {
@@ -22600,6 +22612,266 @@ static const NSSItem nss_builtins_items_339 [] = {
   { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
+static const NSSItem nss_builtins_items_340 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
+"\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151"
+"\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156"
+"\162\151\143\150\051"
+, (PRUint32)101 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105"
+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
+"\141\154\040\122\157\157\164"
+, (PRUint32)119 },
+  { (void *)"\002\006\007\377\377\377\377\377"
+, (PRUint32)8 },
+  { (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007"
+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
+"\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023"
+"\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124"
+"\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060"
+"\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145"
+"\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163"
+"\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023"
+"\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040"
+"\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060"
+"\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062"
+"\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060"
+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
+"\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003"
+"\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145"
+"\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051"
+"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001"
+"\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144"
+"\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376"
+"\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312"
+"\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225"
+"\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152"
+"\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173"
+"\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335"
+"\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177"
+"\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001"
+"\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035"
+"\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134"
+"\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001"
+"\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005"
+"\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142"
+"\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164"
+"\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056"
+"\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003"
+"\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006"
+"\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061"
+"\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026"
+"\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157"
+"\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023"
+"\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040"
+"\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061"
+"\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171"
+"\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040"
+"\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004"
+"\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072"
+"\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165"
+"\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103"
+"\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060"
+"\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027"
+"\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015"
+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201"
+"\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005"
+"\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325"
+"\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377"
+"\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222"
+"\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113"
+"\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362"
+"\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305"
+"\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143"
+"\131"
+, (PRUint32)977 }
+};
+static const NSSItem nss_builtins_items_341 [] = {
+  { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
+  { (void *)"\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025"
+"\214\071\131\117"
+, (PRUint32)20 },
+  { (void *)"\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152"
+, (PRUint32)16 },
+  { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105"
+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
+"\141\154\040\122\157\157\164"
+, (PRUint32)119 },
+  { (void *)"\002\006\007\377\377\377\377\377"
+, (PRUint32)8 },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_342 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
+"\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151"
+"\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050"
+"\105\156\162\151\143\150\051"
+, (PRUint32)103 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\040\050\062\060\064\070\051"
+, (PRUint32)183 },
+  { (void *)"\002\006\007\377\377\377\377\377"
+, (PRUint32)8 },
+  { (void *)"\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007"
+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
+"\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012"
+"\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060"
+"\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162"
+"\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070"
+"\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056"
+"\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061"
+"\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071"
+"\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114"
+"\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023"
+"\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061"
+"\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065"
+"\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060"
+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
+"\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003"
+"\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145"
+"\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143"
+"\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+"\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065"
+"\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140"
+"\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026"
+"\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313"
+"\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336"
+"\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245"
+"\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044"
+"\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167"
+"\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026"
+"\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166"
+"\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063"
+"\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312"
+"\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364"
+"\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046"
+"\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150"
+"\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205"
+"\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060"
+"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
+"\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001"
+"\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006"
+"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005"
+"\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006"
+"\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006"
+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
+"\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156"
+"\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006"
+"\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005"
+"\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167"
+"\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171"
+"\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004"
+"\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072"
+"\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145"
+"\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003"
+"\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060"
+"\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321"
+"\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
+"\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153"
+"\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003"
+"\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001"
+"\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014"
+"\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063"
+"\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142"
+"\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264"
+"\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251"
+"\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330"
+"\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327"
+"\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013"
+"\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113"
+"\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227"
+"\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100"
+"\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247"
+"\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011"
+"\355\020\342\305"
+, (PRUint32)1236 }
+};
+static const NSSItem nss_builtins_items_343 [] = {
+  { (void *)&cko_nss_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
+  { (void *)"\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151"
+"\005\155\061\046"
+, (PRUint32)20 },
+  { (void *)"\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362"
+, (PRUint32)16 },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\040\050\062\060\064\070\051"
+, (PRUint32)183 },
+  { (void *)"\002\006\007\377\377\377\377\377"
+, (PRUint32)8 },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_nss_not_trusted, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
 
 builtinsInternalObject
 nss_builtins_data[] = {
@@ -22944,11 +23216,15 @@ nss_builtins_data[] = {
   { 11, nss_builtins_types_336, nss_builtins_items_336, {NULL} },
   { 13, nss_builtins_types_337, nss_builtins_items_337, {NULL} },
   { 11, nss_builtins_types_338, nss_builtins_items_338, {NULL} },
-  { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} }
+  { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} },
+  { 11, nss_builtins_types_340, nss_builtins_items_340, {NULL} },
+  { 13, nss_builtins_types_341, nss_builtins_items_341, {NULL} },
+  { 11, nss_builtins_types_342, nss_builtins_items_342, {NULL} },
+  { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} }
 };
 const PRUint32
 #ifdef DEBUG
-  nss_builtins_nObjects = 339+1;
+  nss_builtins_nObjects = 343+1;
 #else
-  nss_builtins_nObjects = 339;
+  nss_builtins_nObjects = 343;
 #endif /* DEBUG */
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index d81be890324..ef6ab23f078 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -23299,3 +23299,284 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061
+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
+\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151
+\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156
+\162\151\143\150\051
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
+\141\154\040\122\157\157\164
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\007\377\377\377\377\377
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007
+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
+\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023
+\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124
+\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060
+\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145
+\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163
+\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023
+\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040
+\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060
+\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062
+\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060
+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
+\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003
+\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145
+\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051
+\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001
+\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144
+\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376
+\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312
+\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225
+\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152
+\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173
+\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335
+\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177
+\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001
+\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035
+\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134
+\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001
+\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005
+\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142
+\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164
+\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056
+\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006
+\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061
+\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026
+\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157
+\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023
+\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040
+\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061
+\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171
+\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040
+\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004
+\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072
+\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165
+\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103
+\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060
+\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027
+\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015
+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201
+\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005
+\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325
+\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377
+\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222
+\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113
+\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362
+\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305
+\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143
+\131
+END
+
+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025
+\214\071\131\117
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
+\141\154\040\122\157\157\164
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\007\377\377\377\377\377
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061
+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
+\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151
+\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050
+\105\156\162\151\143\150\051
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\040\050\062\060\064\070\051
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\007\377\377\377\377\377
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007
+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
+\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012
+\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060
+\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162
+\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070
+\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056
+\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061
+\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071
+\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114
+\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023
+\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061
+\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065
+\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060
+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
+\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003
+\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145
+\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143
+\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
+\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065
+\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140
+\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026
+\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313
+\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336
+\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245
+\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044
+\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167
+\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026
+\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166
+\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063
+\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312
+\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364
+\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046
+\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150
+\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205
+\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060
+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
+\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001
+\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006
+\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005
+\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006
+\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006
+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
+\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156
+\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006
+\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005
+\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167
+\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171
+\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004
+\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072
+\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145
+\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003
+\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060
+\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321
+\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
+\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153
+\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003
+\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001
+\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014
+\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063
+\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142
+\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264
+\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251
+\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330
+\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327
+\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013
+\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113
+\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227
+\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100
+\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247
+\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011
+\355\020\342\305
+END
+
+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151
+\005\155\061\046
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\040\050\062\060\064\070\051
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\006\007\377\377\377\377\377
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h
index 01fbc3176b1..3e470905859 100644
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -77,8 +77,8 @@
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 87
-#define NSS_BUILTINS_LIBRARY_VERSION "1.87"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 88
+#define NSS_BUILTINS_LIBRARY_VERSION "1.88"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/services/sync/tests/unit/test_errorhandler.js b/services/sync/tests/unit/test_errorhandler.js
index 35732c654b2..666cbe4591f 100644
--- a/services/sync/tests/unit/test_errorhandler.js
+++ b/services/sync/tests/unit/test_errorhandler.js
@@ -120,6 +120,7 @@ function setUp() {
   Service.username = "johndoe";
   Service.password = "ilovejane";
   Service.passphrase = "abcdeabcdeabcdeabcdeabcdea";
+  Service.serverURL  = "http://localhost:8080/";
   Service.clusterURL = "http://localhost:8080/";
   return generateAndUploadKeys();
 }
diff --git a/services/sync/tests/unit/test_syncscheduler.js b/services/sync/tests/unit/test_syncscheduler.js
index 8b9577d1741..2bad8597513 100644
--- a/services/sync/tests/unit/test_syncscheduler.js
+++ b/services/sync/tests/unit/test_syncscheduler.js
@@ -852,6 +852,7 @@ add_test(function test_loginError_recoverable_reschedules() {
   Service.username = "johndoe";
   Service.password = "ilovejane";
   Service.passphrase = "abcdeabcdeabcdeabcdeabcdea";
+  Service.serverURL  = "http://localhost:8080/";
   Service.clusterURL = "http://localhost:8080/";
   Service.persistLogin();
   Status.resetSync(); // reset Status.login
@@ -895,6 +896,7 @@ add_test(function test_loginError_fatal_clearsTriggers() {
   Service.username = "johndoe";
   Service.password = "ilovejane";
   Service.passphrase = "abcdeabcdeabcdeabcdeabcdea";
+  Service.serverURL  = "http://localhost:8080/";
   Service.clusterURL = "http://localhost:8080/";
   Service.persistLogin();
   Status.resetSync(); // reset Status.login
diff --git a/storage/test/test_file_perms.cpp b/storage/test/test_file_perms.cpp
index 36b3f728b27..576700456bf 100644
--- a/storage/test/test_file_perms.cpp
+++ b/storage/test/test_file_perms.cpp
@@ -48,19 +48,24 @@
 void
 test_file_perms()
 {
-  nsCOMPtr<nsIFile> profDir;
-  (void)NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profDir));
-  nsCOMPtr<nsILocalFile> sqlite_file = do_QueryInterface(profDir);
-  sqlite_file->Append(NS_LITERAL_STRING("places.sqlite"));
+  nsCOMPtr<mozIStorageConnection> db(getDatabase());
+  nsCOMPtr<nsIFile> dbFile;
+  do_check_success(db->GetDatabaseFile(getter_AddRefs(dbFile)));
+
+  nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(dbFile);
+  do_check_true(localFile);
+
   PRUint32 perms = 0;
-  sqlite_file->GetPermissions(&perms);
+  do_check_success(localFile->GetPermissions(&perms));
 
   // This reflexts the permissions defined by SQLITE_DEFAULT_FILE_PERMISSIONS in
   // db/sqlite3/src/Makefile.in and must be kept in sync with that
 #ifdef ANDROID
-  do_check_true(perms == PR_IRUSR | PR_IWUSR);
+  do_check_true(perms == (PR_IRUSR | PR_IWUSR));
+#elif defined(XP_WIN)
+  do_check_true(perms == (PR_IRUSR | PR_IWUSR | PR_IRGRP | PR_IWGRP | PR_IROTH | PR_IWOTH));
 #else
-  do_check_true(perms == PR_IRUSR | PR_IWUSR | PR_IRGRP | PR_IWGRP | PR_IROTH | PR_IWOTH);
+  do_check_true(perms == (PR_IRUSR | PR_IWUSR | PR_IRGRP | PR_IROTH));
 #endif
 }
 
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
index 179768ad0f3..00a6e7d5b34 100644
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -46,6 +46,7 @@
 
 #include "mozIStorageService.h"
 #include "nsIAlertsService.h"
+#include "nsIClassInfoImpl.h"
 #include "nsIDOMWindow.h"
 #include "nsIDownloadHistory.h"
 #include "nsIDownloadManagerUI.h"
@@ -2130,8 +2131,14 @@ nsDownloadManager::ConfirmCancelDownloads(PRInt32 aCount,
 ////////////////////////////////////////////////////////////////////////////////
 //// nsDownload
 
-NS_IMPL_ISUPPORTS4(nsDownload, nsIDownload, nsITransfer, nsIWebProgressListener,
-                   nsIWebProgressListener2)
+NS_IMPL_CLASSINFO(nsDownload, NULL, 0, NS_DOWNLOAD_CID)
+NS_IMPL_ISUPPORTS4_CI(
+    nsDownload
+  , nsIDownload
+  , nsITransfer
+  , nsIWebProgressListener
+  , nsIWebProgressListener2
+)
 
 nsDownload::nsDownload() : mDownloadState(nsIDownloadManager::DOWNLOAD_NOTSTARTED),
                            mID(0),
@@ -2399,6 +2406,11 @@ nsDownload::OnProgressChange64(nsIWebProgress *aWebProgress,
     if (resumableChannel)
       (void)resumableChannel->GetEntityID(mEntityID);
 
+    // Before we update the state and dispatch state notifications, we want to
+    // ensure that we have the correct state for this download with regards to
+    // its percent completion and size.
+    SetProgressBytes(0, aMaxTotalProgress);
+
     // Update the state and the database
     rv = SetState(nsIDownloadManager::DOWNLOAD_DOWNLOADING);
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/toolkit/components/places/tests/cpp/places_test_harness.h b/toolkit/components/places/tests/cpp/places_test_harness.h
index 7d3f8c00fda..951359195ed 100644
--- a/toolkit/components/places/tests/cpp/places_test_harness.h
+++ b/toolkit/components/places/tests/cpp/places_test_harness.h
@@ -134,28 +134,23 @@ public:
   NS_DECL_ISUPPORTS
 
   WaitForTopicSpinner(const char* const aTopic)
-  : mTopic(aTopic)
-  , mTopicReceived(false)
+  : mTopicReceived(false)
   , mStartTime(PR_IntervalNow())
   {
+    nsCOMPtr<nsIObserverService> observerService =
+      do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
+    do_check_true(observerService);
+    (void)observerService->AddObserver(this, aTopic, false);
   }
 
   void Spin() {
-    nsCOMPtr<nsIObserverService> observerService =
-      do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
-    if (observerService) {
-      (void)observerService->AddObserver(this, mTopic, false);
-
-      while (!mTopicReceived) {
-        if (PR_IntervalNow() - mStartTime > WAITFORTOPIC_TIMEOUT_SECONDS * PR_USEC_PER_SEC) {
-          // Timed out waiting for the topic.
-          do_check_true(false);
-          break;
-        }
-        (void)NS_ProcessNextEvent();
+    while (!mTopicReceived) {
+      if ((PR_IntervalNow() - mStartTime) > (WAITFORTOPIC_TIMEOUT_SECONDS * PR_USEC_PER_SEC)) {
+        // Timed out waiting for the topic.
+        do_check_true(false);
+        break;
       }
-
-      (void)observerService->RemoveObserver(this, mTopic);
+      (void)NS_ProcessNextEvent();
     }
   }
 
@@ -163,13 +158,15 @@ public:
                      const char* aTopic,
                      const PRUnichar* aData)
   {
-    do_check_false(strcmp(aTopic, mTopic));
     mTopicReceived = true;
+    nsCOMPtr<nsIObserverService> observerService =
+      do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
+    do_check_true(observerService);
+    (void)observerService->RemoveObserver(this, aTopic);
     return NS_OK;
   }
 
 private:
-  const char* const mTopic;
   bool mTopicReceived;
   PRIntervalTime mStartTime;
 };
@@ -187,9 +184,11 @@ NS_IMPL_ISUPPORTS1(
 void
 addURI(nsIURI* aURI)
 {
+  nsRefPtr<WaitForTopicSpinner> spinner =
+    new WaitForTopicSpinner(TOPIC_FRECENCY_UPDATED);
+
   nsCOMPtr<nsINavHistoryService> hist =
     do_GetService(NS_NAVHISTORYSERVICE_CONTRACTID);
-
   PRInt64 id;
   nsresult rv = hist->AddVisit(aURI, PR_Now(), nsnull,
                                nsINavHistoryService::TRANSITION_LINK, false,
@@ -197,8 +196,6 @@ addURI(nsIURI* aURI)
   do_check_success(rv);
 
   // Wait for frecency update.
-  nsRefPtr<WaitForTopicSpinner> spinner =
-    new WaitForTopicSpinner(TOPIC_FRECENCY_UPDATED);
   spinner->Spin();
 }
 
@@ -334,36 +331,24 @@ do_get_lastVisit(PRInt64 placeId, VisitRecord& result)
 
 static const char TOPIC_PROFILE_TEARDOWN[] = "profile-change-teardown";
 static const char TOPIC_PROFILE_CHANGE[] = "profile-before-change";
+static const char TOPIC_PLACES_CONNECTION_CLOSED[] = "places-connection-closed";
 
-class ShutdownObserver : public nsIObserver
+class ProfileScopedXPCOM : public ScopedXPCOM
 {
 public:
-  NS_DECL_ISUPPORTS
-
-  ShutdownObserver()
+  ProfileScopedXPCOM(const char* testName)
+    : ScopedXPCOM(testName)
   {
-    nsCOMPtr<nsIObserverService> observerService =
-      do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
-    do_check_true(observerService);
-    observerService->AddObserver(this,
-                                 NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID,
-                                 false);
   }
 
-  NS_IMETHOD Observe(nsISupports* aSubject,
-                     const char* aTopic,
-                     const PRUnichar* aData)
-  {
-    if (strcmp(aTopic, NS_XPCOM_WILL_SHUTDOWN_OBSERVER_ID) == 0) {
-      nsCOMPtr<nsIObserverService> os =
-        do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
-      (void)os->NotifyObservers(nsnull, TOPIC_PROFILE_TEARDOWN, nsnull);
-      (void)os->NotifyObservers(nsnull, TOPIC_PROFILE_CHANGE, nsnull);
-    }
-      return NS_OK;
+  ~ProfileScopedXPCOM() {
+    nsRefPtr<WaitForTopicSpinner> spinner =
+      new WaitForTopicSpinner(TOPIC_PLACES_CONNECTION_CLOSED);
+    nsCOMPtr<nsIObserverService> os =
+      do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
+    (void)os->NotifyObservers(nsnull, TOPIC_PROFILE_TEARDOWN, nsnull);
+    (void)os->NotifyObservers(nsnull, TOPIC_PROFILE_CHANGE, nsnull);
+    // Wait for connection close.
+    spinner->Spin();
   }
 };
-NS_IMPL_ISUPPORTS1(
-  ShutdownObserver,
-  nsIObserver
-)
diff --git a/toolkit/components/places/tests/cpp/places_test_harness_tail.h b/toolkit/components/places/tests/cpp/places_test_harness_tail.h
index 31266623b7f..856129c6151 100644
--- a/toolkit/components/places/tests/cpp/places_test_harness_tail.h
+++ b/toolkit/components/places/tests/cpp/places_test_harness_tail.h
@@ -114,9 +114,8 @@ int
 main(int aArgc,
      char** aArgv)
 {
-  ScopedXPCOM xpcom(TEST_NAME);
-  nsRefPtr<ShutdownObserver> shutdownObserver = new ShutdownObserver();
-
+  ProfileScopedXPCOM xpcom(TEST_NAME);
+  nsCOMPtr<nsIFile> profile = xpcom.GetProfileDirectory();
 
   // Tinderboxes are constantly on idle.  Since idle tasks can interact with
   // tests, causing random failures, disable the idle service.
diff --git a/toolkit/components/places/tests/cpp/test_IHistory.cpp b/toolkit/components/places/tests/cpp/test_IHistory.cpp
index 31ee993b443..07b19ec0ae9 100644
--- a/toolkit/components/places/tests/cpp/test_IHistory.cpp
+++ b/toolkit/components/places/tests/cpp/test_IHistory.cpp
@@ -149,10 +149,10 @@ test_set_places_enabled()
 // sets the nsCOMPtr's to nsnull, freeing the reference.
 namespace test_unvisited_does_not_notify {
   nsCOMPtr<nsIURI> testURI;
-  nsCOMPtr<Link> testLink;
+  nsRefPtr<Link> testLink;
 }
 void
-test_unvisted_does_not_notify_part1()
+test_unvisited_does_not_notify_part1()
 {
   using namespace test_unvisited_does_not_notify;
 
@@ -169,7 +169,7 @@ test_unvisted_does_not_notify_part1()
   testLink = new mock_Link(expect_no_visit);
 
   // Now, register our Link to be notified.
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->RegisterVisitedCallback(testURI, testLink);
   do_check_success(rv);
 
@@ -181,29 +181,30 @@ void
 test_visited_notifies()
 {
   // First, we add our test URI to history.
-  nsCOMPtr<nsIURI> testURI(new_test_uri());
+  nsCOMPtr<nsIURI> testURI = new_test_uri();
   addURI(testURI);
 
   // Create our test Link.  The callback function will release the reference we
   // have on the Link.
-  Link* link = new mock_Link(expect_visit);
-  NS_ADDREF(link);
+  nsRefPtr<Link> link = new mock_Link(expect_visit);
 
   // Now, register our Link to be notified.
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->RegisterVisitedCallback(testURI, link);
   do_check_success(rv);
+
+  link.forget(); // It will release itself when notified.
   // Note: test will continue upon notification.
 }
 
 void
-test_unvisted_does_not_notify_part2()
+test_unvisited_does_not_notify_part2()
 {
   using namespace test_unvisited_does_not_notify;
 
   // We would have had a failure at this point had the content node been told it
   // was visited.  Therefore, it is safe to unregister our content node.
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->UnregisterVisitedCallback(testURI, testLink);
   do_check_success(rv);
 
@@ -219,24 +220,24 @@ void
 test_same_uri_notifies_both()
 {
   // First, we add our test URI to history.
-  nsCOMPtr<nsIURI> testURI(new_test_uri());
+  nsCOMPtr<nsIURI> testURI = new_test_uri();
   addURI(testURI);
 
   // Create our two test Links.  The callback function will release the
   // reference we have on the Links.  Only the second Link should run the next
   // test!
-  Link* link1 = new mock_Link(expect_visit, false);
-  NS_ADDREF(link1);
-  Link* link2 = new mock_Link(expect_visit);
-  NS_ADDREF(link2);
+  nsRefPtr<Link> link1 = new mock_Link(expect_visit, false);
+  nsRefPtr<Link> link2 = new mock_Link(expect_visit);
 
   // Now, register our Link to be notified.
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->RegisterVisitedCallback(testURI, link1);
   do_check_success(rv);
   rv = history->RegisterVisitedCallback(testURI, link2);
   do_check_success(rv);
 
+  link1.forget(); // It will release itself when notified.
+  link2.forget(); // It will release itself when notified.
   // Note: test will continue upon notification.
 }
 
@@ -247,8 +248,8 @@ test_unregistered_visited_does_not_notify()
   // The Link would have been notified by now if we were buggy and notified
   // unregistered Links (due to request serialization).
 
-  nsCOMPtr<nsIURI> testURI(new_test_uri());
-  nsCOMPtr<Link> link(new mock_Link(expect_no_visit));
+  nsCOMPtr<nsIURI> testURI = new_test_uri();
+  nsRefPtr<Link> link = new mock_Link(expect_no_visit);
 
   // Now, register our Link to be notified.
   nsCOMPtr<IHistory> history(do_get_IHistory());
@@ -276,18 +277,18 @@ test_new_visit_notifies_waiting_Link()
 {
   // Create our test Link.  The callback function will release the reference we
   // have on the link.
-  Link* link = new mock_Link(expect_visit);
-  NS_ADDREF(link);
+  nsRefPtr<Link> link = new mock_Link(expect_visit);
 
   // Now, register our content node to be notified.
-  nsCOMPtr<nsIURI> testURI(new_test_uri());
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> testURI = new_test_uri();
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->RegisterVisitedCallback(testURI, link);
   do_check_success(rv);
 
   // Add ourselves to history.
   addURI(testURI);
 
+  link.forget(); // It will release itself when notified.
   // Note: test will continue upon notification.
 }
 
@@ -295,14 +296,14 @@ void
 test_RegisterVisitedCallback_returns_before_notifying()
 {
   // Add a URI so that it's already in history.
-  nsCOMPtr<nsIURI> testURI(new_test_uri());
+  nsCOMPtr<nsIURI> testURI = new_test_uri();
   addURI(testURI);
 
   // Create our test Link.
-  nsCOMPtr<Link> link(new mock_Link(expect_no_visit));
+  nsRefPtr<Link> link = new mock_Link(expect_no_visit);
 
   // Now, register our content node to be notified.  It should not be notified.
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->RegisterVisitedCallback(testURI, link);
   do_check_success(rv);
 
@@ -346,8 +347,9 @@ namespace test_observer_topic_dispatched_helpers {
       do_check_false(strcmp(aTopic, URI_VISITED_RESOLUTION_TOPIC));
 
       // If this isn't for our URI, do not do anything.
-      nsCOMPtr<nsIURI> notifiedURI(do_QueryInterface(aSubject));
+      nsCOMPtr<nsIURI> notifiedURI = do_QueryInterface(aSubject);
       do_check_true(notifiedURI);
+
       bool isOurURI;
       nsresult rv = notifiedURI->Equals(mURI, &isOurURI);
       do_check_success(rv);
@@ -389,8 +391,8 @@ test_observer_topic_dispatched()
   using namespace test_observer_topic_dispatched_helpers;
 
   // Create two URIs, making sure only one is in history.
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-  nsCOMPtr<nsIURI> notVisitedURI(new_test_uri());
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
+  nsCOMPtr<nsIURI> notVisitedURI = new_test_uri();
   bool urisEqual;
   nsresult rv = visitedURI->Equals(notVisitedURI, &urisEqual);
   do_check_success(rv);
@@ -398,21 +400,21 @@ test_observer_topic_dispatched()
   addURI(visitedURI);
 
   // Need two Link objects as well - one for each URI.
-  nsCOMPtr<Link> visitedLink(new mock_Link(expect_visit, false));
-  nsCOMPtr<Link> visitedLinkCopy = visitedLink;
+  nsRefPtr<Link> visitedLink = new mock_Link(expect_visit, false);
+  nsRefPtr<Link> visitedLinkCopy = visitedLink;
   visitedLinkCopy.forget(); // It will release itself when notified.
-  nsCOMPtr<Link> notVisitedLink(new mock_Link(expect_no_visit));
+  nsRefPtr<Link> notVisitedLink = new mock_Link(expect_no_visit);
 
   // Add the right observers for the URIs to check results.
   bool visitedNotified = false;
-  nsCOMPtr<nsIObserver> vistedObs =
+  nsCOMPtr<nsIObserver> visitedObs =
     new statusObserver(visitedURI, true, visitedNotified);
   bool notVisitedNotified = false;
-  nsCOMPtr<nsIObserver> unvistedObs =
+  nsCOMPtr<nsIObserver> unvisitedObs =
     new statusObserver(notVisitedURI, false, notVisitedNotified);
 
   // Register our Links to be notified.
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   rv = history->RegisterVisitedCallback(visitedURI, visitedLink);
   do_check_success(rv);
   rv = history->RegisterVisitedCallback(notVisitedURI, notVisitedLink);
@@ -433,13 +435,13 @@ test_observer_topic_dispatched()
 void
 test_visituri_inserts()
 {
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
+  nsCOMPtr<nsIURI> lastURI = new_test_uri();
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
 
   history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
 
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  nsRefPtr<VisitURIObserver> finisher = new VisitURIObserver();
   finisher->WaitForNotification();
 
   PlaceRecord place;
@@ -456,10 +458,10 @@ test_visituri_inserts()
 void
 test_visituri_updates()
 {
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-  nsCOMPtr<VisitURIObserver> finisher;
+  nsCOMPtr<IHistory> history = do_get_IHistory();
+  nsCOMPtr<nsIURI> lastURI = new_test_uri();
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
+  nsRefPtr<VisitURIObserver> finisher;
 
   history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
   finisher = new VisitURIObserver();
@@ -480,16 +482,16 @@ test_visituri_updates()
 void
 test_visituri_preserves_shown_and_typed()
 {
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
+  nsCOMPtr<nsIURI> lastURI = new_test_uri();
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
 
   history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
   // this simulates the uri visit happening in a frame.  Normally frame
   // transitions would be hidden unless it was previously loaded top-level
   history->VisitURI(visitedURI, lastURI, 0);
 
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver(2);
+  nsRefPtr<VisitURIObserver> finisher = new VisitURIObserver(2);
   finisher->WaitForNotification();
 
   PlaceRecord place;
@@ -502,12 +504,12 @@ test_visituri_preserves_shown_and_typed()
 void
 test_visituri_creates_visit()
 {
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
+  nsCOMPtr<nsIURI> lastURI = new_test_uri();
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
 
   history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  nsRefPtr<VisitURIObserver> finisher = new VisitURIObserver();
   finisher->WaitForNotification();
 
   PlaceRecord place;
@@ -527,13 +529,13 @@ test_visituri_transition_typed()
 {
   nsCOMPtr<nsINavHistoryService> navHistory = do_get_NavHistory();
   nsCOMPtr<nsIBrowserHistory> browserHistory = do_QueryInterface(navHistory);
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
+  nsCOMPtr<nsIURI> lastURI = new_test_uri();
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
 
   browserHistory->MarkPageAsTyped(visitedURI);
   history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  nsRefPtr<VisitURIObserver> finisher = new VisitURIObserver();
   finisher->WaitForNotification();
 
   PlaceRecord place;
@@ -551,12 +553,12 @@ test_visituri_transition_embed()
 {
   nsCOMPtr<nsINavHistoryService> navHistory = do_get_NavHistory();
   nsCOMPtr<nsIBrowserHistory> browserHistory = do_QueryInterface(navHistory);
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
+  nsCOMPtr<nsIURI> lastURI = new_test_uri();
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
 
   history->VisitURI(visitedURI, lastURI, 0);
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  nsRefPtr<VisitURIObserver> finisher = new VisitURIObserver();
   finisher->WaitForNotification();
 
   PlaceRecord place;
@@ -574,12 +576,12 @@ void
 test_new_visit_adds_place_guid()
 {
   // First, add a visit and wait.  This will also add a place.
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->VisitURI(visitedURI, NULL,
                                   mozilla::IHistory::TOP_LEVEL);
   do_check_success(rv);
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  nsRefPtr<VisitURIObserver> finisher = new VisitURIObserver();
   finisher->WaitForNotification();
 
   // Check that we have a guid for our visit.
@@ -600,9 +602,9 @@ test_two_null_links_same_uri()
   // Tests that we do not crash when we have had two NULL Links passed to
   // RegisterVisitedCallback and then the visit occurs (bug 607469).  This only
   // happens in IPC builds.
-  nsCOMPtr<nsIURI> testURI(new_test_uri());
+  nsCOMPtr<nsIURI> testURI = new_test_uri();
 
-  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<IHistory> history = do_get_IHistory();
   nsresult rv = history->RegisterVisitedCallback(testURI, NULL);
   do_check_success(rv);
   rv = history->RegisterVisitedCallback(testURI, NULL);
@@ -611,7 +613,7 @@ test_two_null_links_same_uri()
   rv = history->VisitURI(testURI, NULL, mozilla::IHistory::TOP_LEVEL);
   do_check_success(rv);
 
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  nsRefPtr<VisitURIObserver> finisher = new VisitURIObserver();
   finisher->WaitForNotification();
 
   run_next_test();
@@ -625,9 +627,9 @@ test_two_null_links_same_uri()
  */
 Test gTests[] = {
   TEST(test_set_places_enabled), // Must come first!
-  TEST(test_unvisted_does_not_notify_part1), // Order Important!
+  TEST(test_unvisited_does_not_notify_part1), // Order Important!
   TEST(test_visited_notifies),
-  TEST(test_unvisted_does_not_notify_part2), // Order Important!
+  TEST(test_unvisited_does_not_notify_part2), // Order Important!
   TEST(test_same_uri_notifies_both),
   TEST(test_unregistered_visited_does_not_notify), // Order Important!
   TEST(test_new_visit_notifies_waiting_Link),
diff --git a/toolkit/components/satchel/nsFormAutoComplete.js b/toolkit/components/satchel/nsFormAutoComplete.js
index c730d91400f..be2142c33d1 100644
--- a/toolkit/components/satchel/nsFormAutoComplete.js
+++ b/toolkit/components/satchel/nsFormAutoComplete.js
@@ -73,7 +73,7 @@ FormAutoComplete.prototype = {
         // Preferences. Add observer so we get notified of changes.
         this._prefBranch = Services.prefs.getBranch("browser.formfill.");
         this._prefBranch.QueryInterface(Ci.nsIPrefBranch2);
-        this._prefBranch.addObserver("", this.observer, false);
+        this._prefBranch.addObserver("", this.observer, true);
         this.observer._self = this;
 
         this._debug            = this._prefBranch.getBoolPref("debug");
@@ -86,7 +86,7 @@ FormAutoComplete.prototype = {
 
         this._dbStmts = [];
 
-        Services.obs.addObserver(this.observer, "xpcom-shutdown", false);
+        Services.obs.addObserver(this.observer, "xpcom-shutdown", true);
     },
 
     observer : {
diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in
index dc35a3d9557..ce24485be1e 100644
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -66,8 +66,6 @@ endif
 endif
 endif
 
-EXTRA_COMPONENTS = nsTryToClose.js nsTryToClose.manifest
-
 ifdef ENABLE_TESTS
 ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS += tests/browser
diff --git a/toolkit/components/startup/nsTryToClose.manifest b/toolkit/components/startup/nsTryToClose.manifest
deleted file mode 100644
index 16d39e22050..00000000000
--- a/toolkit/components/startup/nsTryToClose.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-component {b69155f4-a8bf-453d-8653-91d1456e1d3d} nsTryToClose.js
-contract @mozilla.org/appshell/trytoclose;1 {b69155f4-a8bf-453d-8653-91d1456e1d3d}
-category app-startup nsTryToClose service,@mozilla.org/appshell/trytoclose;1
diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
index c04dd51c13c..920fcde7b64 100644
--- a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
@@ -42,31 +42,37 @@ dontLeavePrivateBrowsingButton=Stay in Private Browsing Mode
 downloadsCompleteTitle=Downloads Complete
 downloadsCompleteMsg=All files have finished downloading. 
 
-# LOCALIZATION NOTE (statusFormat2): — is the "em dash" (long dash)
-# #1 transfer progress; #2 rate number; #3 rate unit; #4 time left
+# LOCALIZATION NOTE (statusFormat3): — is the "em dash" (long dash)
+# %1$S transfer progress; %2$S rate number; %3$S rate unit; %4$S time left
 # example: 4 minutes left — 1.1 of 11.1 GB (2.2 MB/sec)
-statusFormat2=#4 — #1 (#2 #3/sec)
+statusFormat3=%4$S — %1$S (%2$S %3$S/sec)
 bytes=bytes
 kilobyte=KB
 megabyte=MB
 gigabyte=GB
 
-# LOCALIZATION NOTE (transferSameUnits, transferDiffUnits, transferNoTotal):
-# #1 progress number; #2 progress unit; #3 total number; #4 total unit
-# examples: 1.1 of 333 MB; 11.1 MB of 3.3 GB; 111 KB
-transferSameUnits=#1 of #3 #4
-transferDiffUnits=#1 #2 of #3 #4
-transferNoTotal=#1 #2
+# LOCALIZATION NOTE (transferSameUnits2):
+# %1$S progress number; %2$S total number; %3$S total unit
+# example: 1.1 of 333 MB
+transferSameUnits2=%1$S of %2$S %3$S
+# LOCALIZATION NOTE (transferDiffUnits2):
+# %1$S progress number; %2$S progress unit; %3$S total number; %4$S total unit
+# example: 11.1 MB of 3.3 GB
+transferDiffUnits2=%1$S %2$S of %3$S %4$S
+# LOCALIZATION NOTE (transferNoTotal2):
+# %1$S progress number; %2$S unit
+# example: 111 KB
+transferNoTotal2=%1$S %2$S
 
-# LOCALIZATION NOTE (timePair): #1 time number; #2 time unit
+# LOCALIZATION NOTE (timePair2): %1$S time number; %2$S time unit
 # example: 1 minute; 11 hours
-timePair=#1 #2
-# LOCALIZATION NOTE (timeLeftSingle): #1 time left
+timePair2=%1$S %2$S
+# LOCALIZATION NOTE (timeLeftSingle2): %1$S time left
 # example: 1 minute remaining; 11 hours remaining
-timeLeftSingle=#1 remaining
-# LOCALIZATION NOTE (timeLeftDouble): #1 time left; #2 time left sub units
+timeLeftSingle2=%1$S remaining
+# LOCALIZATION NOTE (timeLeftDouble2): %1$S time left; %2$S time left sub units
 # example: 11 hours, 2 minutes remaining; 1 day, 22 hours remaining
-timeLeftDouble=#1, #2 remaining
+timeLeftDouble2=%1$S, %2$S remaining
 timeFewSeconds=A few seconds remaining
 timeUnknown=Unknown time remaining
 
@@ -79,7 +85,7 @@ doneStatus=#1 — #2
 doneSize=#1 #2
 doneSizeUnknown=Unknown size
 # LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
-doneScheme=#1 resource
+doneScheme2=%1$S resource
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
 doneFileScheme=local file
@@ -95,7 +101,7 @@ stateDirty=Blocked: Download may contain a virus or spyware
 # LOCALIZATION NOTE (yesterday): Displayed time for files finished yesterday
 yesterday=Yesterday
 # LOCALIZATION NOTE (monthDate): #1 month name; #2 date number; e.g., January 22
-monthDate=#1 #2
+monthDate2=%1$S %2$S
 
 fileDoesNotExistOpenTitle=Cannot Open %S
 fileDoesNotExistShowTitle=Cannot Show %S
diff --git a/toolkit/mozapps/downloads/DownloadUtils.jsm b/toolkit/mozapps/downloads/DownloadUtils.jsm
index 39d925872ba..81b682f5921 100644
--- a/toolkit/mozapps/downloads/DownloadUtils.jsm
+++ b/toolkit/mozapps/downloads/DownloadUtils.jsm
@@ -1,4 +1,5 @@
-/* ***** BEGIN LICENSE BLOCK *****
+/* vim: sw=2 ts=2 sts=2 expandtab filetype=javascript
+ * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -84,76 +85,32 @@ __defineGetter__("gDecimalSymbol", function() {
 const kDownloadProperties =
   "chrome://mozapps/locale/downloads/downloads.properties";
 
-// These strings will be converted to the corresponding ones from the string
-// bundle on use
-let kStrings = {
-  statusFormat: "statusFormat2",
-  transferSameUnits: "transferSameUnits",
-  transferDiffUnits: "transferDiffUnits",
-  transferNoTotal: "transferNoTotal",
-  timePair: "timePair",
-  timeLeftSingle: "timeLeftSingle",
-  timeLeftDouble: "timeLeftDouble",
+let gStr = {
+  statusFormat: "statusFormat3",
+  transferSameUnits: "transferSameUnits2",
+  transferDiffUnits: "transferDiffUnits2",
+  transferNoTotal: "transferNoTotal2",
+  timePair: "timePair2",
+  timeLeftSingle: "timeLeftSingle2",
+  timeLeftDouble: "timeLeftDouble2",
   timeFewSeconds: "timeFewSeconds",
   timeUnknown: "timeUnknown",
-  monthDate: "monthDate",
+  monthDate: "monthDate2",
   yesterday: "yesterday",
-  doneScheme: "doneScheme",
+  doneScheme: "doneScheme2",
   doneFileScheme: "doneFileScheme",
   units: ["bytes", "kilobyte", "megabyte", "gigabyte"],
   // Update timeSize in convertTimeUnits if changing the length of this array
   timeUnits: ["seconds", "minutes", "hours", "days"],
 };
 
-// This object will lazily load the strings defined in kStrings
-let gStr = {
-  /**
-   * Initialize lazy string getters
-   */
-  _init: function()
-  {
-    // Make each "name" a lazy-loading string that knows how to load itself. We
-    // need to locally scope name and value to keep them around for the getter.
-    for (let [name, value] in Iterator(kStrings))
-      let ([n, v] = [name, value])
-        gStr.__defineGetter__(n, function() gStr._getStr(n, v));
-  },
-
-  /**
-   * Convert strings to those in the string bundle. This lazily loads the
-   * string bundle *once* only when used the first time.
-   */
-  get _getStr()
-  {
-    // Delete the getter to be overwritten
-    delete gStr._getStr;
-
-    // Lazily load the bundle into the closure on first call to _getStr
-    let getStr = Cc["@mozilla.org/intl/stringbundle;1"].
-                 getService(Ci.nsIStringBundleService).
-                 createBundle(kDownloadProperties).
-                 GetStringFromName;
-
-    // _getStr is a function that sets string "name" to stringbundle's "value"
-    return gStr._getStr = function(name, value) {
-      // Delete the getter to be overwritten
-      delete gStr[name];
-
-      try {
-        // "name" is a string or array of the stringbundle-loaded "value"
-        return gStr[name] = typeof value == "string" ?
-                            getStr(value) :
-                            value.map(getStr);
-      } catch (e) {
-        log(["Couldn't get string '", name, "' from property '", value, "'"]);
-        // Don't return anything (undefined), and because we deleted ourselves,
-        // future accesses will also be undefined
-      }
-    };
-  },
-};
-// Initialize the lazy string getters!
-gStr._init();
+// This lazily initializes the string bundle upon first use.
+__defineGetter__("gBundle", function() {
+  delete gBundle;
+  return this.gBundle = Cc["@mozilla.org/intl/stringbundle;1"].
+                        getService(Ci.nsIStringBundleService).
+                        createBundle(kDownloadProperties);
+});
 
 // Keep track of at most this many second/lastSec pairs so that multiple calls
 // to getTimeLeft produce the same time left
@@ -189,28 +146,14 @@ let DownloadUtils = {
     let seconds = (aSpeed > 0) && (aMaxBytes > 0) ?
       (aMaxBytes - aCurrBytes) / aSpeed : -1;
 
-    // Update the bytes transferred and bytes total
-    let status;
-    let (transfer = DownloadUtils.getTransferTotal(aCurrBytes, aMaxBytes)) {
-      // Insert 1 is the download progress
-      status = replaceInsert(gStr.statusFormat, 1, transfer);
-    }
+    let transfer = DownloadUtils.getTransferTotal(aCurrBytes, aMaxBytes);
+    let [rate, unit] = DownloadUtils.convertByteUnits(aSpeed);
+    let [timeLeft, newLast] = DownloadUtils.getTimeLeft(seconds, aLastSec);
 
-    // Update the download rate
-    let ([rate, unit] = DownloadUtils.convertByteUnits(aSpeed)) {
-      // Insert 2 is the download rate
-      status = replaceInsert(status, 2, rate);
-      // Insert 3 is the |unit|/sec
-      status = replaceInsert(status, 3, unit);
-    }
-
-    // Update time remaining
-    let ([timeLeft, newLast] = DownloadUtils.getTimeLeft(seconds, aLastSec)) {
-      // Insert 4 is the time remaining
-      status = replaceInsert(status, 4, timeLeft);
-
-      return [status, newLast];
-    }
+    let params = [transfer, rate, unit, timeLeft];
+    let status = gBundle.formatStringFromName(gStr.statusFormat, params,
+                                              params.length);
+    return [status, newLast];
   },
 
   /**
@@ -233,20 +176,31 @@ let DownloadUtils = {
     let [total, totalUnits] = DownloadUtils.convertByteUnits(aMaxBytes);
 
     // Figure out which byte progress string to display
-    let transfer;
-    if (aMaxBytes < 0)
-      transfer = gStr.transferNoTotal;
-    else if (progressUnits == totalUnits)
-      transfer = gStr.transferSameUnits;
-    else
-      transfer = gStr.transferDiffUnits;
+    let name, values;
+    if (aMaxBytes < 0) {
+      name = gStr.transferNoTotal;
+      values = [
+        progress,
+        progressUnits,
+      ];
+    } else if (progressUnits == totalUnits) {
+      name = gStr.transferSameUnits;
+      values = [
+        progress,
+        total,
+        totalUnits,
+      ];
+    } else {
+      name = gStr.transferDiffUnits;
+      values = [
+        progress,
+        progressUnits,
+        total,
+        totalUnits,
+      ];
+    }
 
-    transfer = replaceInsert(transfer, 1, progress);
-    transfer = replaceInsert(transfer, 2, progressUnits);
-    transfer = replaceInsert(transfer, 3, total);
-    transfer = replaceInsert(transfer, 4, totalUnits);
-
-    return transfer;
+    return gBundle.formatStringFromName(name, values, values.length);
   },
 
   /**
@@ -267,7 +221,7 @@ let DownloadUtils = {
       aLastSec = Infinity;
 
     if (aSeconds < 0)
-      return [gStr.timeUnknown, aLastSec];
+      return [gBundle.GetStringFromName(gStr.timeUnknown), aLastSec];
 
     // Try to find a cached lastSec for the given second
     aLastSec = gCachedLast.reduce(function(aResult, aItem)
@@ -300,25 +254,26 @@ let DownloadUtils = {
     let timeLeft;
     if (aSeconds < 4) {
       // Be friendly in the last few seconds
-      timeLeft = gStr.timeFewSeconds;
+      timeLeft = gBundle.GetStringFromName(gStr.timeFewSeconds);
     } else {
       // Convert the seconds into its two largest units to display
       let [time1, unit1, time2, unit2] =
         DownloadUtils.convertTimeUnits(aSeconds);
 
-      let pair1 = replaceInsert(gStr.timePair, 1, time1);
-      pair1 = replaceInsert(pair1, 2, unit1);
-      let pair2 = replaceInsert(gStr.timePair, 1, time2);
-      pair2 = replaceInsert(pair2, 2, unit2);
+      let pair1 =
+        gBundle.formatStringFromName(gStr.timePair, [time1, unit1], 2);
+      let pair2 =
+        gBundle.formatStringFromName(gStr.timePair, [time2, unit2], 2);
 
       // Only show minutes for under 1 hour unless there's a few minutes left;
       // or the second pair is 0.
       if ((aSeconds < 3600 && time1 >= 4) || time2 == 0) {
-        timeLeft = replaceInsert(gStr.timeLeftSingle, 1, pair1);
+        timeLeft = gBundle.formatStringFromName(gStr.timeLeftSingle,
+                                                [pair1], 1);
       } else {
         // We've got 2 pairs of times to display
-        timeLeft = replaceInsert(gStr.timeLeftDouble, 1, pair1);
-        timeLeft = replaceInsert(timeLeft, 2, pair2);
+        timeLeft = gBundle.formatStringFromName(gStr.timeLeftDouble,
+                                                [pair1, pair2], 2);
       }
     }
 
@@ -364,7 +319,7 @@ let DownloadUtils = {
                                        0);
     } else if (today - aDate < (24 * 60 * 60 * 1000)) {
       // After yesterday started, show yesterday
-      dateTimeCompact = gStr.yesterday;
+      dateTimeCompact = gBundle.GetStringFromName(gStr.yesterday);
     } else if (today - aDate < (6 * 24 * 60 * 60 * 1000)) {
       // After last week started, show day of week
       dateTimeCompact = aDate.toLocaleFormat("%A");
@@ -373,8 +328,7 @@ let DownloadUtils = {
       let month = aDate.toLocaleFormat("%B");
       // Remove leading 0 by converting the date string to a number
       let date = Number(aDate.toLocaleFormat("%d"));
-      dateTimeCompact = replaceInsert(gStr.monthDate, 1, month);
-      dateTimeCompact = replaceInsert(dateTimeCompact, 2, date);
+      dateTimeCompact = gBundle.formatStringFromName(gStr.monthDate, [month, date], 2);
     }
 
     let dateTimeFull = dts.FormatDateTime("",
@@ -437,11 +391,12 @@ let DownloadUtils = {
     // Check if we need to show something else for the host
     if (uri.scheme == "file") {
       // Display special text for file protocol
-      displayHost = gStr.doneFileScheme;
+      displayHost = gBundle.GetStringFromName(gStr.doneFileScheme);
       fullHost = displayHost;
     } else if (displayHost.length == 0) {
       // Got nothing; show the scheme (data: about: moz-icon:)
-      displayHost = replaceInsert(gStr.doneScheme, 1, uri.scheme);
+      displayHost =
+        gBundle.formatStringFromName(gStr.doneScheme, [uri.scheme], 1);
       fullHost = displayHost;
     } else if (uri.port != -1) {
       // Tack on the port if it's not the default port
@@ -479,7 +434,7 @@ let DownloadUtils = {
 
     if (gDecimalSymbol != ".")
       aBytes = aBytes.replace(".", gDecimalSymbol);
-    return [aBytes, gStr.units[unitIndex]];
+    return [aBytes, gBundle.GetStringFromName(gStr.units[unitIndex])];
   },
 
   /**
@@ -552,23 +507,7 @@ function convertTimeUnitsUnits(aTime, aIndex)
   if (aIndex < 0)
     return "";
 
-  return PluralForm.get(aTime, gStr.timeUnits[aIndex]);
-}
-
-/**
- * Private helper function to replace a placeholder string with a real string
- *
- * @param aText
- *        Source text containing placeholder (e.g., #1)
- * @param aIndex
- *        Index number of placeholder to replace
- * @param aValue
- *        New string to put in place of placeholder
- * @return The string with placeholder replaced with the new string
- */
-function replaceInsert(aText, aIndex, aValue)
-{
-  return aText.replace("#" + aIndex, aValue);
+  return PluralForm.get(aTime, gBundle.GetStringFromName(gStr.timeUnits[aIndex]));
 }
 
 /**
diff --git a/toolkit/mozapps/downloads/content/DownloadProgressListener.js b/toolkit/mozapps/downloads/content/DownloadProgressListener.js
index d1ae908f294..b345b36ac38 100644
--- a/toolkit/mozapps/downloads/content/DownloadProgressListener.js
+++ b/toolkit/mozapps/downloads/content/DownloadProgressListener.js
@@ -63,6 +63,7 @@ DownloadProgressListener.prototype = {
     // Update window title in-case we don't get all progress notifications
     onUpdateProgress();
 
+    let dl;
     let state = aDownload.state;
     switch (state) {
       case nsIDM.DOWNLOAD_QUEUED:
@@ -82,16 +83,26 @@ DownloadProgressListener.prototype = {
         if (state == nsIDM.DOWNLOAD_FINISHED)
           autoRemoveAndClose(aDownload);
         break;
+      case nsIDM.DOWNLOAD_DOWNLOADING: {
+        dl = getDownload(aDownload.id);
+
+        // At this point, we know if we are an indeterminate download or not
+        dl.setAttribute("progressmode", aDownload.percentComplete == -1 ?
+                                        "undetermined" : "normal");
+
+        // As well as knowing the referrer
+        let referrer = aDownload.referrer;
+        if (referrer)
+          dl.setAttribute("referrer", referrer.spec);
+
+        break;
+      }
     }
 
     // autoRemoveAndClose could have already closed our window...
     try {
-      let dl = getDownload(aDownload.id);
-
-      // We should eventually know the referrer at some point
-      let referrer = aDownload.referrer;
-      if (referrer)
-        dl.setAttribute("referrer", referrer.spec);
+      if (!dl)
+        dl = getDownload(aDownload.id);
 
       // Update to the new state
       dl.setAttribute("state", state);
@@ -112,18 +123,15 @@ DownloadProgressListener.prototype = {
     var download = getDownload(aDownload.id);
 
     // Update this download's progressmeter
-    if (aDownload.percentComplete == -1) {
-      download.setAttribute("progressmode", "undetermined");
-    } else {
-      download.setAttribute("progressmode", "normal");
+    if (aDownload.percentComplete != -1) {
       download.setAttribute("progress", aDownload.percentComplete);
-    }
 
-    // Dispatch ValueChange for a11y
-    var event = document.createEvent("Events");
-    event.initEvent("ValueChange", true, true);
-    document.getAnonymousElementByAttribute(download, "anonid", "progressmeter")
-            .dispatchEvent(event);
+      // Dispatch ValueChange for a11y
+      let event = document.createEvent("Events");
+      event.initEvent("ValueChange", true, true);
+      document.getAnonymousElementByAttribute(download, "anonid", "progressmeter")
+              .dispatchEvent(event);
+    }
 
     // Update the progress so the status can be correctly updated
     download.setAttribute("currBytes", aDownload.amountTransferred);
diff --git a/toolkit/mozapps/downloads/content/downloads.js b/toolkit/mozapps/downloads/content/downloads.js
index 481594d486c..7bd7ec8109c 100644
--- a/toolkit/mozapps/downloads/content/downloads.js
+++ b/toolkit/mozapps/downloads/content/downloads.js
@@ -411,7 +411,7 @@ function onUpdateProgress()
   var base = 0;
   var dls = gDownloadManager.activeDownloads;
   while (dls.hasMoreElements()) {
-    let dl = dls.getNext().QueryInterface(Ci.nsIDownload);
+    let dl = dls.getNext();
     if (dl.percentComplete < 100 && dl.size > 0) {
       mean += dl.amountTransferred;
       base += dl.size;
diff --git a/toolkit/mozapps/extensions/AddonRepository.jsm b/toolkit/mozapps/extensions/AddonRepository.jsm
index 1f6b4d9e01c..53d526fe390 100644
--- a/toolkit/mozapps/extensions/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/AddonRepository.jsm
@@ -1290,10 +1290,10 @@ var AddonDatabase = {
   // false if there was an unrecoverable error openning the database
   databaseOk: true,
   // A cache of statements that are used and need to be finalized on shutdown
-  statementCache: {},
+  asyncStatementsCache: {},
 
-  // The statements used by the database
-  statements: {
+  // The queries used by the database
+  queries: {
     getAllAddons: "SELECT internal_id, id, type, name, version, " +
                   "creator, creatorURL, description, fullDescription, " +
                   "developerComments, eula, iconURL, homepageURL, supportURL, " +
@@ -1445,9 +1445,9 @@ var AddonDatabase = {
 
     this.initialized = false;
 
-    for each (let stmt in this.statementCache)
+    for each (let stmt in this.asyncStatementsCache)
       stmt.finalize();
-    this.statementCache = {};
+    this.asyncStatementsCache = {};
 
     if (this.connection.transactionInProgress) {
       ERROR("Outstanding transaction, rolling back.");
@@ -1485,20 +1485,21 @@ var AddonDatabase = {
   },
 
   /**
-   * Gets a cached statement or creates a new statement if it doesn't already
-   * exist.
+   * Gets a cached async statement or creates a new statement if it doesn't
+   * already exist.
    *
    * @param  aKey
    *         A unique key to reference the statement
-   * @return a mozIStorageStatement for the SQL corresponding to the unique key
+   * @return a mozIStorageAsyncStatement for the SQL corresponding to the
+   *         unique key
    */
-  getStatement: function AD_getStatement(aKey) {
-    if (aKey in this.statementCache)
-      return this.statementCache[aKey];
+  getAsyncStatement: function AD_getAsyncStatement(aKey) {
+    if (aKey in this.asyncStatementsCache)
+      return this.asyncStatementsCache[aKey];
 
-    let sql = this.statements[aKey];
+    let sql = this.queries[aKey];
     try {
-      return this.statementCache[aKey] = this.connection.createStatement(sql);
+      return this.asyncStatementsCache[aKey] = this.connection.createAsyncStatement(sql);
     } catch (e) {
       ERROR("Error creating statement " + aKey + " (" + sql + ")");
       throw e;
@@ -1518,7 +1519,7 @@ var AddonDatabase = {
 
     // Retrieve all data from the addon table
     function getAllAddons() {
-      self.getStatement("getAllAddons").executeAsync({
+      self.getAsyncStatement("getAllAddons").executeAsync({
         handleResult: function(aResults) {
           let row = null;
           while (row = aResults.getNextRow()) {
@@ -1543,7 +1544,7 @@ var AddonDatabase = {
 
     // Retrieve all data from the developer table
     function getAllDevelopers() {
-      self.getStatement("getAllDevelopers").executeAsync({
+      self.getAsyncStatement("getAllDevelopers").executeAsync({
         handleResult: function(aResults) {
           let row = null;
           while (row = aResults.getNextRow()) {
@@ -1577,7 +1578,7 @@ var AddonDatabase = {
 
     // Retrieve all data from the screenshot table
     function getAllScreenshots() {
-      self.getStatement("getAllScreenshots").executeAsync({
+      self.getAsyncStatement("getAllScreenshots").executeAsync({
         handleResult: function(aResults) {
           let row = null;
           while (row = aResults.getNextRow()) {
@@ -1628,7 +1629,7 @@ var AddonDatabase = {
     let self = this;
 
     // Completely empty the database
-    let stmts = [this.getStatement("emptyAddon")];
+    let stmts = [this.getAsyncStatement("emptyAddon")];
 
     this.connection.executeAsync(stmts, stmts.length, {
       handleResult: function() {},
@@ -1694,7 +1695,7 @@ var AddonDatabase = {
         if (!aArray || aArray.length == 0)
           return;
 
-        let stmt = self.getStatement(aStatementKey);
+        let stmt = self.getAsyncStatement(aStatementKey);
         let params = stmt.newBindingParamsArray();
         aArray.forEach(function(aElement, aIndex) {
           aAddParams(params, internal_id, aElement, aIndex);
@@ -1761,7 +1762,7 @@ var AddonDatabase = {
    * @return The asynchronous mozIStorageStatement
    */
   _makeAddonStatement: function AD__makeAddonStatement(aAddon) {
-    let stmt = this.getStatement("insertAddon");
+    let stmt = this.getAsyncStatement("insertAddon");
     let params = stmt.params;
 
     PROP_SINGLE.forEach(function(aProperty) {
diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
index 6ce80de99fd..f6f44f326fd 100644
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -1759,7 +1759,7 @@ var XPIProvider = {
     }
 
     // Ensure any changes to the add-ons list are flushed to disk
-    XPIDatabase.writeAddonsList();
+    XPIDatabase.writeAddonsList([]);
     Services.prefs.setBoolPref(PREF_PENDING_OPERATIONS, false);
   },
 
@@ -2942,18 +2942,16 @@ var XPIProvider = {
 
     let state = this.getInstallLocationStates();
 
+    // If the database exists then the previous file cache can be trusted
+    // otherwise the database needs to be recreated
+    let dbFile = FileUtils.getFile(KEY_PROFILEDIR, [FILE_DATABASE], true);
+    updateDatabase |= !dbFile.exists();
     if (!updateDatabase) {
       // If the state has changed then we must update the database
       let cache = Prefs.getCharPref(PREF_INSTALL_CACHE, null);
       updateDatabase |= cache != JSON.stringify(state);
     }
 
-    // If the database doesn't exist and there are add-ons installed then we
-    // must update the database however if there are no add-ons then there is
-    // no need to update the database.
-    if (!XPIDatabase.dbfile.exists())
-      updateDatabase = state.length > 0;
-
     if (!updateDatabase) {
       let bootstrapDescriptors = [this.bootstrappedAddons[b].descriptor
                                   for (b in this.bootstrappedAddons)];
@@ -2965,7 +2963,7 @@ var XPIProvider = {
             bootstrapDescriptors.splice(pos, 1);
         }
       });
-
+  
       if (bootstrapDescriptors.length > 0) {
         WARN("Bootstrap state is invalid (missing add-ons: " + bootstrapDescriptors.toSource() + ")");
         updateDatabase = true;
@@ -2979,7 +2977,7 @@ var XPIProvider = {
       // If the database needs to be updated then open it and then update it
       // from the filesystem
       if (updateDatabase || hasPendingChanges) {
-        let migrateData = XPIDatabase.openConnection(false, true);
+        let migrateData = XPIDatabase.openConnection(false);
 
         try {
           extensionListChanged = this.processFileChanges(state, manifests,
@@ -3034,8 +3032,8 @@ var XPIProvider = {
     // Check that the add-ons list still exists
     let addonsList = FileUtils.getFile(KEY_PROFILEDIR, [FILE_XPI_ADDONS_LIST],
                                        true);
-    if (addonsList.exists() == (state.length == 0)) {
-      LOG("Add-ons list is invalid, rebuilding");
+    if (!addonsList.exists()) {
+      LOG("Add-ons list is missing, recreating");
       XPIDatabase.writeAddonsList();
     }
 
@@ -4024,8 +4022,6 @@ var XPIDatabase = {
   addonCache: [],
   // The nested transaction count
   transactionCount: 0,
-  // The database file
-  dbfile: FileUtils.getFile(KEY_PROFILEDIR, [FILE_DATABASE], true),
 
   // The statements used by the database
   statements: {
@@ -4075,8 +4071,7 @@ var XPIDatabase = {
                      "type<>'theme' AND bootstrap=0",
     getActiveTheme: "SELECT " + FIELDS_ADDON + " FROM addon WHERE " +
                     "internalName=:internalName AND type='theme'",
-    getThemes: "SELECT " + FIELDS_ADDON + " FROM addon WHERE type='theme' AND " +
-               "internalName<>:defaultSkin",
+    getThemes: "SELECT " + FIELDS_ADDON + " FROM addon WHERE type='theme'",
 
     getAddonInLocation: "SELECT " + FIELDS_ADDON + " FROM addon WHERE id=:id " +
                         "AND location=:location",
@@ -4218,17 +4213,12 @@ var XPIDatabase = {
    * @return the migration data from the database if it was an old schema or
    *         null otherwise.
    */
-  openConnection: function XPIDB_openConnection(aRebuildOnError, aForceOpen) {
+  openConnection: function XPIDB_openConnection(aRebuildOnError) {
+    this.initialized = true;
+    let dbfile = FileUtils.getFile(KEY_PROFILEDIR, [FILE_DATABASE], true);
     delete this.connection;
 
-    if (!aForceOpen && !this.dbfile.exists()) {
-      this.connection = null;
-      return {};
-    }
-
-    this.initialized = true;
-
-    this.connection = this.openDatabaseFile(this.dbfile);
+    this.connection = this.openDatabaseFile(dbfile);
 
     let migrateData = null;
     // If the database was corrupt or missing then the new blank database will
@@ -4245,11 +4235,11 @@ var XPIDatabase = {
         // Delete the existing database
         this.connection.close();
         try {
-          if (this.dbfile.exists())
-            this.dbfile.remove(true);
+          if (dbfile.exists())
+            dbfile.remove(true);
 
           // Reopen an empty database
-          this.connection = this.openDatabaseFile(this.dbfile);
+          this.connection = this.openDatabaseFile(dbfile);
         }
         catch (e) {
           ERROR("Failed to remove old database", e);
@@ -4260,6 +4250,7 @@ var XPIDatabase = {
       }
       else if (Prefs.getIntPref(PREF_DB_SCHEMA, 0) == 0) {
         // Only migrate data from the RDF if we haven't done it before
+        LOG("Migrating data from extensions.rdf");
         migrateData = this.getMigrateDataFromRDF();
       }
 
@@ -4359,7 +4350,6 @@ var XPIDatabase = {
     // Migrate data from extensions.rdf
     let rdffile = FileUtils.getFile(KEY_PROFILEDIR, [FILE_OLD_DATABASE], true);
     if (rdffile.exists()) {
-      LOG("Migrating data from extensions.rdf");
       let ds = gRDF.GetDataSourceBlocking(Services.io.newFileURI(rdffile).spec);
       let root = Cc["@mozilla.org/rdf/container;1"].
                  createInstance(Ci.nsIRDFContainer);
@@ -4973,9 +4963,6 @@ var XPIDatabase = {
    * @return  an array of names of install locations
    */
   getInstallLocations: function XPIDB_getInstallLocations() {
-    if (!this.connection)
-      return [];
-
     let stmt = this.getStatement("getInstallLocations");
 
     return [row.location for each (row in resultRows(stmt))];
@@ -4989,9 +4976,6 @@ var XPIDatabase = {
    * @return an array of DBAddonInternals
    */
   getAddonsInLocation: function XPIDB_getAddonsInLocation(aLocation) {
-    if (!this.connection)
-      return [];
-
     let stmt = this.getStatement("getAddonsInLocation");
 
     stmt.params.location = aLocation;
@@ -5010,11 +4994,6 @@ var XPIDatabase = {
    *         A callback to pass the DBAddonInternal to
    */
   getAddonInLocation: function XPIDB_getAddonInLocation(aId, aLocation, aCallback) {
-    if (!this.connection) {
-      aCallback(null);
-      return;
-    }
-
     let stmt = this.getStatement("getAddonInLocation");
 
     stmt.params.id = aId;
@@ -5041,11 +5020,6 @@ var XPIDatabase = {
    *         A callback to pass the DBAddonInternal to
    */
   getVisibleAddonForID: function XPIDB_getVisibleAddonForID(aId, aCallback) {
-    if (!this.connection) {
-      aCallback(null);
-      return;
-    }
-
     let stmt = this.getStatement("getVisibleAddonForID");
 
     stmt.params.id = aId;
@@ -5071,11 +5045,6 @@ var XPIDatabase = {
    *         A callback to pass the array of DBAddonInternals to
    */
   getVisibleAddons: function XPIDB_getVisibleAddons(aTypes, aCallback) {
-    if (!this.connection) {
-      aCallback([]);
-      return;
-    }
-
     let stmt = null;
     if (!aTypes || aTypes.length == 0) {
       stmt = this.getStatement("getVisibleAddons");
@@ -5107,9 +5076,6 @@ var XPIDatabase = {
    * @return an array of DBAddonInternals
    */
   getAddonsByType: function XPIDB_getAddonsByType(aType) {
-    if (!this.connection)
-      return [];
-
     let stmt = this.getStatement("getAddonsByType");
 
     stmt.params.type = aType;
@@ -5124,9 +5090,6 @@ var XPIDatabase = {
    * @return a DBAddonInternal
    */
   getVisibleAddonForInternalName: function XPIDB_getVisibleAddonForInternalName(aInternalName) {
-    if (!this.connection)
-      return null;
-
     let stmt = this.getStatement("getVisibleAddonForInternalName");
 
     let addon = null;
@@ -5149,11 +5112,6 @@ var XPIDatabase = {
    */
   getVisibleAddonsWithPendingOperations:
     function XPIDB_getVisibleAddonsWithPendingOperations(aTypes, aCallback) {
-    if (!this.connection) {
-      aCallback([]);
-      return;
-    }
-
     let stmt = null;
     if (!aTypes || aTypes.length == 0) {
       stmt = this.getStatement("getVisibleAddonsWithPendingOperations");
@@ -5185,9 +5143,6 @@ var XPIDatabase = {
    * @return  an array of DBAddonInternals
    */
   getAddons: function XPIDB_getAddons() {
-    if (!this.connection)
-      return [];
-
     let stmt = this.getStatement("getAddons");
 
     return [this.makeAddonFromRow(row) for each (row in resultRows(stmt))];;
@@ -5202,10 +5157,6 @@ var XPIDatabase = {
    *         The file descriptor of the add-on
    */
   addAddonMetadata: function XPIDB_addAddonMetadata(aAddon, aDescriptor) {
-    // If there is no DB yet then forcibly create one
-    if (!this.connection)
-      this.openConnection(false, true);
-
     this.beginTransaction();
 
     var self = this;
@@ -5471,24 +5422,14 @@ var XPIDatabase = {
    * Writes out the XPI add-ons list for the platform to read.
    */
   writeAddonsList: function XPIDB_writeAddonsList() {
+    LOG("Writing add-ons list");
     Services.appinfo.invalidateCachesOnRestart();
-
     let addonsList = FileUtils.getFile(KEY_PROFILEDIR, [FILE_XPI_ADDONS_LIST],
                                        true);
-    if (!this.connection) {
-      if (addonsList.exists()) {
-        LOG("Deleting add-ons list");
-        addonsList.remove(false);
-      }
-
-      Services.prefs.clearUserPref(PREF_EM_ENABLED_ADDONS);
-      return;
-    }
 
     let enabledAddons = [];
     let text = "[ExtensionDirs]\r\n";
     let count = 0;
-    let fullCount = 0;
 
     let stmt = this.getStatement("getActiveAddons");
 
@@ -5496,47 +5437,28 @@ var XPIDatabase = {
       text += "Extension" + (count++) + "=" + row.descriptor + "\r\n";
       enabledAddons.push(row.id + ":" + row.version);
     }
-    fullCount += count;
 
     // The selected skin may come from an inactive theme (the default theme
     // when a lightweight theme is applied for example)
     text += "\r\n[ThemeDirs]\r\n";
-
-    stmt = null;
     if (Prefs.getBoolPref(PREF_EM_DSS_ENABLED)) {
       stmt = this.getStatement("getThemes");
-      stmt.params.defaultSkin = XPIProvider.defaultSkin;
     }
-    else if (XPIProvider.selectedSkin != XPIProvider.defaultSkin) {
+    else {
       stmt = this.getStatement("getActiveTheme");
       stmt.params.internalName = XPIProvider.selectedSkin;
     }
-
-    if (stmt) {
-      count = 0;
-      for (let row in resultRows(stmt)) {
-        text += "Extension" + (count++) + "=" + row.descriptor + "\r\n";
-        enabledAddons.push(row.id + ":" + row.version);
-      }
-      fullCount += count;
+    count = 0;
+    for (let row in resultRows(stmt)) {
+      text += "Extension" + (count++) + "=" + row.descriptor + "\r\n";
+      enabledAddons.push(row.id + ":" + row.version);
     }
 
-    if (fullCount > 0) {
-      LOG("Writing add-ons list");
-      var fos = FileUtils.openSafeFileOutputStream(addonsList);
-      fos.write(text, text.length);
-      FileUtils.closeSafeFileOutputStream(fos);
+    var fos = FileUtils.openSafeFileOutputStream(addonsList);
+    fos.write(text, text.length);
+    FileUtils.closeSafeFileOutputStream(fos);
 
-      Services.prefs.setCharPref(PREF_EM_ENABLED_ADDONS, enabledAddons.join(","));
-    }
-    else {
-      if (addonsList.exists()) {
-        LOG("Deleting add-ons list");
-        addonsList.remove(false);
-      }
-
-      Services.prefs.clearUserPref(PREF_EM_ENABLED_ADDONS);
-    }
+    Services.prefs.setCharPref(PREF_EM_ENABLED_ADDONS, enabledAddons.join(","));
   }
 };
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
index 31937eecfd4..5478dba6e42 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -447,13 +447,9 @@ function check_startup_changes(aType, aIds) {
   var ids = aIds.slice(0);
   ids.sort();
   var changes = AddonManager.getStartupChanges(aType);
+  changes = changes.filter(function(aEl) /@tests.mozilla.org$/.test(aEl));
   changes.sort();
 
-  // Remove the default theme if it is in the list
-  var pos = changes.indexOf("{972ce4c6-7e08-4474-a285-3208198ce6fd}");
-  if (pos != -1)
-    changes.splice(pos, 1);
-
   do_check_eq(JSON.stringify(ids), JSON.stringify(changes));
 }
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js b/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
index 8e7c7bc9214..d5cdf2a70fc 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
@@ -125,13 +125,6 @@ function run_test() {
 
   startupManager();
 
-  let file = gProfD.clone();
-  file.append("extensions.sqlite");
-  do_check_false(file.exists());
-
-  file.leafName = "extensions.ini";
-  do_check_false(file.exists());
-
   run_test_1();
 }
 
@@ -174,13 +167,6 @@ function run_test_1() {
 }
 
 function check_test_1() {
-  let file = gProfD.clone();
-  file.append("extensions.sqlite");
-  do_check_true(file.exists());
-
-  file.leafName = "extensions.ini";
-  do_check_false(file.exists());
-
   AddonManager.getAllInstalls(function(installs) {
     // There should be no active installs now since the install completed and
     // doesn't require a restart.
@@ -261,10 +247,6 @@ function run_test_3() {
   do_check_eq(getShutdownReason(), ADDON_DISABLE);
   do_check_not_in_crash_annotation("bootstrap1@tests.mozilla.org", "1.0");
 
-  let file = gProfD.clone();
-  file.append("extensions.ini");
-  do_check_false(file.exists());
-
   AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
     do_check_neq(b1, null);
     do_check_eq(b1.version, "1.0");
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js
index b51a3d6fd18..c9b5234bcdf 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug563256.js
@@ -48,7 +48,7 @@ function run_test() {
     do_check_false(d.userDisabled);
     do_check_false(d.appDisabled);
     do_check_true(d.isActive);
-    do_check_false(isThemeInAddonsList(profileDir, d.id));
+    do_check_true(isThemeInAddonsList(profileDir, d.id));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
@@ -76,7 +76,7 @@ function run_test_1(d, a) {
   do_check_true(d.userDisabled);
   do_check_false(d.appDisabled);
   do_check_true(d.isActive);
-  do_check_false(isThemeInAddonsList(profileDir, d.id));
+  do_check_true(isThemeInAddonsList(profileDir, d.id));
   do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
   do_check_true(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
@@ -94,7 +94,7 @@ function run_test_1(d, a) {
   do_check_false(d.userDisabled);
   do_check_false(d.appDisabled);
   do_check_true(d.isActive);
-  do_check_false(isThemeInAddonsList(profileDir, d.id));
+  do_check_true(isThemeInAddonsList(profileDir, d.id));
   do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
   do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
@@ -121,7 +121,7 @@ function run_test_2() {
     do_check_false(d.userDisabled);
     do_check_false(d.appDisabled);
     do_check_true(d.isActive);
-    do_check_false(isThemeInAddonsList(profileDir, d.id));
+    do_check_true(isThemeInAddonsList(profileDir, d.id));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
@@ -140,7 +140,7 @@ function run_test_2() {
     do_check_true(d.userDisabled);
     do_check_false(d.appDisabled);
     do_check_true(d.isActive);
-    do_check_false(isThemeInAddonsList(profileDir, d.id));
+    do_check_true(isThemeInAddonsList(profileDir, d.id));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
     do_check_true(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
@@ -158,7 +158,7 @@ function run_test_2() {
     do_check_false(d.userDisabled);
     do_check_false(d.appDisabled);
     do_check_true(d.isActive);
-    do_check_false(isThemeInAddonsList(profileDir, d.id));
+    do_check_true(isThemeInAddonsList(profileDir, d.id));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
@@ -176,7 +176,7 @@ function run_test_2() {
     do_check_true(d.userDisabled);
     do_check_false(d.appDisabled);
     do_check_true(d.isActive);
-    do_check_false(isThemeInAddonsList(profileDir, d.id));
+    do_check_true(isThemeInAddonsList(profileDir, d.id));
     do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
     do_check_true(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
@@ -241,7 +241,7 @@ function check_test_2() {
       do_check_false(d.userDisabled);
       do_check_false(d.appDisabled);
       do_check_true(d.isActive);
-      do_check_false(isThemeInAddonsList(profileDir, d.id));
+      do_check_true(isThemeInAddonsList(profileDir, d.id));
       do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_DISABLE));
       do_check_false(hasFlag(d.permissions, AddonManager.PERM_CAN_ENABLE));
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js b/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
index f4412a6bbcb..71f41b6775f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
@@ -132,13 +132,6 @@ function run_test() {
   check_startup_changes(AddonManager.STARTUP_CHANGE_DISABLED, []);
   check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
 
-  let file = gProfD.clone();
-  file.append("extensions.sqlite");
-  do_check_false(file.exists());
-
-  file.leafName = "extensions.ini";
-  do_check_false(file.exists());
-
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
                                "addon3@tests.mozilla.org",
@@ -190,13 +183,6 @@ function run_test_1() {
   check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
   do_check_true(gCachePurged);
 
-  let file = gProfD.clone();
-  file.append("extensions.sqlite");
-  do_check_true(file.exists());
-
-  file.leafName = "extensions.ini";
-  do_check_true(file.exists());
-
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
                                "addon3@tests.mozilla.org",
@@ -298,10 +284,6 @@ function run_test_2() {
   check_startup_changes(AddonManager.STARTUP_CHANGE_ENABLED, []);
   do_check_true(gCachePurged);
 
-  var file = gProfD.clone();
-  file.append("extensions.ini");
-  do_check_true(file.exists());
-
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
                                "addon3@tests.mozilla.org",
diff --git a/toolkit/mozapps/plugins/content/pluginProblemContent.css b/toolkit/mozapps/plugins/content/pluginProblemContent.css
index 38076ab3c54..8f1fad30b53 100644
--- a/toolkit/mozapps/plugins/content/pluginProblemContent.css
+++ b/toolkit/mozapps/plugins/content/pluginProblemContent.css
@@ -46,7 +46,8 @@ html|applet:not([height]), html|applet[height=""] {
 :-moz-handler-disabled .msgDisabled,
 :-moz-handler-disabled .msgManagePlugins,
 :-moz-handler-blocked .msgBlocked,
-:-moz-handler-crashed .msgCrashed {
+:-moz-handler-crashed .msgCrashed,
+:-moz-handler-crashed .msgReload {
   display: block;
 }
 
@@ -59,8 +60,7 @@ html|applet:not([height]), html|applet[height=""] {
 .submitStatus[status="submitting"] .msgSubmitting,
 .submitStatus[status="success"]    .msgSubmitted,
 .submitStatus[status="failed"]     .msgSubmitFailed,
-.submitStatus[status="please"]     .msgSubmitPlease,
-.submitStatus                      .msgReload {
+.submitStatus[status="please"]     .msgSubmitPlease {
   display: block;
 }
 
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 6583ec6d16e..e873d87ca8a 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -266,6 +266,11 @@ MAKEFILES_content="
   content/xslt/src/xslt/Makefile
 "
 
+MAKEFILES_smil="
+  content/smil/Makefile
+  dom/interfaces/smil/Makefile
+"
+
 MAKEFILES_layout="
   layout/Makefile
   layout/base/Makefile
@@ -513,6 +518,7 @@ MAKEFILES_xpcom="
   xpcom/stub/Makefile
   xpcom/windbgdlg/Makefile
   xpcom/system/Makefile
+  xpcom/idl-parser/Makefile
 "
 
 MAKEFILES_xpcom_tests="
@@ -740,6 +746,7 @@ add_makefiles "
   $MAKEFILES_jsreflect
   $MAKEFILES_jsductwork
   $MAKEFILES_content
+  $MAKEFILES_smil
   $MAKEFILES_layout
   $MAKEFILES_libjar
   $MAKEFILES_libreg
@@ -1082,13 +1089,6 @@ if [ "$MOZ_MAPINFO" ]; then
   "
 fi
 
-if [ "$MOZ_SMIL" ]; then
-  add_makefiles "
-    content/smil/Makefile
-    dom/interfaces/smil/Makefile
-  "
-fi
-
 if [ "$MOZ_XTF" ]; then
   add_makefiles "
     content/xtf/Makefile
diff --git a/tools/trace-malloc/lib/nsTraceMalloc.c b/tools/trace-malloc/lib/nsTraceMalloc.c
index 72098ace3d3..8f47110222a 100644
--- a/tools/trace-malloc/lib/nsTraceMalloc.c
+++ b/tools/trace-malloc/lib/nsTraceMalloc.c
@@ -957,7 +957,7 @@ backtrace(tm_thread *t, int skip, int *immediate_abort)
     t->suppress_tracing++;
 
     if (!stacks_enabled) {
-#if defined(XP_MACOSX)
+#if defined(XP_MACOSX) && defined(__i386)
         /* Walk the stack, even if stacks_enabled is false. We do this to
            check if we must set immediate_abort. */
         info->entries = 0;
diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index 61fcee4c619..da76932b2e5 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -111,9 +111,7 @@ class nsHashKey;
 #define NS_UI_EVENT                       28
 #define NS_SVG_EVENT                      30
 #define NS_SVGZOOM_EVENT                  31
-#ifdef MOZ_SMIL
 #define NS_SMIL_TIME_EVENT                32
-#endif // MOZ_SMIL
 
 #define NS_QUERY_CONTENT_EVENT            33
 
@@ -164,6 +162,8 @@ class nsHashKey;
 
 #define NS_EVENT_RETARGET_TO_NON_NATIVE_ANONYMOUS 0x40000
 
+#define NS_EVENT_FLAG_STOP_DISPATCH_IMMEDIATELY 0x80000
+
 #define NS_EVENT_CAPTURE_MASK             (~(NS_EVENT_FLAG_BUBBLE | NS_EVENT_FLAG_NO_CONTENT_DISPATCH))
 #define NS_EVENT_BUBBLE_MASK              (~(NS_EVENT_FLAG_CAPTURE | NS_EVENT_FLAG_NO_CONTENT_DISPATCH))
 
@@ -508,12 +508,10 @@ class nsHashKey;
 #define NS_ANIMATION_END             (NS_ANIMATION_EVENT_START + 1)
 #define NS_ANIMATION_ITERATION       (NS_ANIMATION_EVENT_START + 2)
 
-#ifdef MOZ_SMIL
 #define NS_SMIL_TIME_EVENT_START     4300
 #define NS_SMIL_BEGIN                (NS_SMIL_TIME_EVENT_START)
 #define NS_SMIL_END                  (NS_SMIL_TIME_EVENT_START + 1)
 #define NS_SMIL_REPEAT               (NS_SMIL_TIME_EVENT_START + 2)
-#endif // MOZ_SMIL
 
 #define NS_MOZTOUCH_EVENT_START      4400
 #define NS_MOZTOUCH_DOWN             (NS_MOZTOUCH_EVENT_START)
diff --git a/widget/src/android/GfxInfo.cpp b/widget/src/android/GfxInfo.cpp
index 46c9def8763..fd09ede2383 100644
--- a/widget/src/android/GfxInfo.cpp
+++ b/widget/src/android/GfxInfo.cpp
@@ -318,5 +318,7 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature,
   if (aOS)
     *aOS = os;
 
-  return GfxInfoBase::GetFeatureStatusImpl(aFeature, aStatus, aSuggestedDriverVersion, aDriverInfo, &os);
+  // XXX disabled for now as this calls GetAdapterVendorID and friends, which currently crash on Android, see bug 700124
+  // return GfxInfoBase::GetFeatureStatusImpl(aFeature, aStatus, aSuggestedDriverVersion, aDriverInfo, &os);
+  return NS_OK;
 }
diff --git a/widget/src/xpwidgets/GfxInfoBase.cpp b/widget/src/xpwidgets/GfxInfoBase.cpp
index 49db5245ba6..e39ef2f2bba 100644
--- a/widget/src/xpwidgets/GfxInfoBase.cpp
+++ b/widget/src/xpwidgets/GfxInfoBase.cpp
@@ -598,15 +598,11 @@ GfxInfoBase::GetFeatureStatusImpl(PRInt32 aFeature,
       NS_FAILED(GetAdapterDeviceID(&adapterDeviceID)) ||
       NS_FAILED(GetAdapterDriverVersion(adapterDriverVersionString)))
   {
-    return NS_ERROR_FAILURE;
+    return NS_OK;
   }
 
   PRUint64 driverVersion;
-  if (!ParseDriverVersion(adapterDriverVersionString, &driverVersion)) {
-#if !defined(XP_MACOSX)
-    return NS_ERROR_FAILURE;
-#endif
-  }
+  ParseDriverVersion(adapterDriverVersionString, &driverVersion);
 
   // special-case the WinXP test slaves: they have out-of-date drivers, but we still want to
   // whitelist them, actually we do know that this combination of device and driver version
diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in
index eed044b76bd..995d0cf7374 100644
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -46,6 +46,7 @@ MODULE		= xpcom
 GRE_MODULE	= 1
 
 DIRS		= \
+		idl-parser \
 		typelib \
 		string \
 		glue \
@@ -90,14 +91,3 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-regenerate-idl-parser:
-	$(PYTHON_PATH) \
-	  -I$(topsrcdir)/other-licenses/ply \
-	  -I$(topsrcdir)/xpcom/idl-parser \
-	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(topsrcdir)/xpcom/idl-parser --regen
-
-check::
-	$(PYTHON_PATH) \
-	  -I$(topsrcdir)/other-licenses/ply \
-	  -I$(topsrcdir)/xpcom/idl-parser \
-	  $(topsrcdir)/xpcom/idl-parser/runtests.py
diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in
new file mode 100644
index 00000000000..20ca148ad25
--- /dev/null
+++ b/xpcom/idl-parser/Makefile.in
@@ -0,0 +1,76 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Mozilla.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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
+# decision by deleting the provisions above and replace them with the notice
+# 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 *****
+
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PARSER_SRCS = \
+  header.py \
+  typelib.py \
+  xpidl.py \
+  $(NULL)
+
+PLY_PROGS = \
+  $(topsrcdir)/other-licenses/ply/ply/lex.py \
+  $(topsrcdir)/other-licenses/ply/ply/yacc.py \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+# Generate the PLY lexer and parser.
+export:: $(PARSER_SRCS) $(PLY_PROGS)
+	$(PYTHON_PATH) \
+	  -I$(topsrcdir)/other-licenses/ply \
+	  -I$(topsrcdir)/xpcom/idl-parser \
+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
+
+check::
+	$(PYTHON_PATH) \
+	  -I$(topsrcdir)/other-licenses/ply \
+	  -I$(topsrcdir)/xpcom/idl-parser \
+	  $(topsrcdir)/xpcom/idl-parser/runtests.py
+
+GARBAGE += \
+  xpidllex.py \
+  xpidllex.pyc \
+  xpidlyacc.py \
+  xpidlyacc.pyc \
+  xpidl_debug \
+  $(NULL)
diff --git a/xpcom/idl-parser/header.py b/xpcom/idl-parser/header.py
index 8d43013134d..2f68e5f40ce 100644
--- a/xpcom/idl-parser/header.py
+++ b/xpcom/idl-parser/header.py
@@ -486,19 +486,20 @@ if __name__ == '__main__':
     o.add_option('--regen', action='store_true', dest='regen', default=False,
                  help="Regenerate IDL Parser cache")
     options, args = o.parse_args()
-    file, = args
+    file = args[0] if args else None
 
     if options.cachedir is not None:
         if not os.path.isdir(options.cachedir):
             os.mkdir(options.cachedir)
         sys.path.append(options.cachedir)
 
+    # Instantiate the parser.
+    p = xpidl.IDLParser(outputdir=options.cachedir)
+
+    # The only thing special about a regen is that there are no input files.
     if options.regen:
         if options.cachedir is None:
-            print >>sys.stderr, "--regen requires --cachedir"
-            sys.exit(1)
-
-        p = xpidl.IDLParser(outputdir=options.cachedir, regen=True)
+            print >>sys.stderr, "--regen useless without --cachedir"
         sys.exit(0)
 
     if options.depfile is not None and options.outfile is None:
@@ -512,7 +513,6 @@ if __name__ == '__main__':
         outfd = sys.stdout
         closeoutfd = False
 
-    p = xpidl.IDLParser(outputdir=options.cachedir)
     idl = p.parse(open(file).read(), filename=file)
     idl.resolve(options.incdirs, p)
     print_header(idl, outfd, file)
diff --git a/xpcom/idl-parser/typelib.py b/xpcom/idl-parser/typelib.py
index 5755080cd1f..893d6a8acb9 100644
--- a/xpcom/idl-parser/typelib.py
+++ b/xpcom/idl-parser/typelib.py
@@ -285,7 +285,7 @@ if __name__ == '__main__':
     o.add_option('--regen', action='store_true', dest='regen', default=False,
                  help="Regenerate IDL Parser cache")
     options, args = o.parse_args()
-    file, = args
+    file = args[0] if args else None
 
     if options.cachedir is not None:
         if not os.path.isdir(options.cachedir):
diff --git a/xpcom/idl-parser/xpidl.py b/xpcom/idl-parser/xpidl.py
index e6af07d1b1a..f25ceb4b1d7 100644
--- a/xpcom/idl-parser/xpidl.py
+++ b/xpcom/idl-parser/xpidl.py
@@ -1445,17 +1445,17 @@ class IDLParser(object):
         location = Location(self.lexer, t.lineno, t.lexpos)
         raise IDLError("invalid syntax", location)
 
-    def __init__(self, outputdir='', regen=False):
+    def __init__(self, outputdir=''):
         self._doccomments = []
         self.lexer = lex.lex(object=self,
                              outputdir=outputdir,
                              lextab='xpidllex',
-                             optimize=0 if regen else 1)
+                             optimize=1)
         self.parser = yacc.yacc(module=self,
                                 outputdir=outputdir,
                                 debugfile='xpidl_debug',
                                 tabmodule='xpidlyacc',
-                                optimize=0 if regen else 1)
+                                optimize=1)
 
     def clearComments(self):
         self._doccomments = []
diff --git a/xpcom/idl-parser/xpidllex.py b/xpcom/idl-parser/xpidllex.py
deleted file mode 100644
index 982fb825e75..00000000000
--- a/xpcom/idl-parser/xpidllex.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# xpidllex.py. This file automatically created by PLY (version 3.3). Don't edit!
-_tabversion   = '3.3'
-_lextokens    = {'TYPEDEF': 1, 'INCLUDE': 1, 'RSHIFT': 1, 'LSHIFT': 1, 'ATTRIBUTE': 1, 'NATIVEID': 1, 'NUMBER': 1, 'NATIVE': 1, 'IID': 1, 'READONLY': 1, 'RAISES': 1, 'CDATA': 1, 'IN': 1, 'INTERFACE': 1, 'CONST': 1, 'IDENTIFIER': 1, 'OUT': 1, 'INOUT': 1, 'HEXNUM': 1}
-_lexreflags   = 0
-_lexliterals  = '"(){}[],;:=|+-*'
-_lexstateinfo = {'nativeid': 'exclusive', 'INITIAL': 'inclusive'}
-_lexstatere   = {'nativeid': [('(?P<t_nativeid_NATIVEID>[^()\\n]+(?=\\)))', [None, ('t_nativeid_NATIVEID', 'NATIVEID')])], 'INITIAL': [('(?P<t_multilinecomment>/\\*(?s).*?\\*/)|(?P<t_singlelinecomment>(?m)//.*?$)|(?P<t_IID>[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})|(?P<t_IDENTIFIER>unsigned\\ long\\ long|unsigned\\ short|unsigned\\ long|long\\ long|[A-Za-z][A-Za-z_0-9]*)|(?P<t_LCDATA>(?s)%\\{[ ]*C\\+\\+[ ]*\\n(?P<cdata>.*?\\n?)%\\}[ ]*(C\\+\\+)?)|(?P<t_INCLUDE>\\#include[ \\t]+"[^"\\n]+")|(?P<t_directive>\\#(?P<directive>[a-zA-Z]+)[^\\n]+)|(?P<t_newline>\\n+)|(?P<t_HEXNUM>0x[a-fA-F0-9]+)|(?P<t_NUMBER>-?\\d+)|(?P<t_LSHIFT><<)|(?P<t_RSHIFT>>>)', [None, ('t_multilinecomment', 'multilinecomment'), ('t_singlelinecomment', 'singlelinecomment'), ('t_IID', 'IID'), ('t_IDENTIFIER', 'IDENTIFIER'), ('t_LCDATA', 'LCDATA'), None, None, ('t_INCLUDE', 'INCLUDE'), ('t_directive', 'directive'), None, ('t_newline', 'newline'), (None, 'HEXNUM'), (None, 'NUMBER'), (None, 'LSHIFT'), (None, 'RSHIFT')])]}
-_lexstateignore = {'nativeid': '', 'INITIAL': ' \t'}
-_lexstateerrorf = {'nativeid': 't_ANY_error', 'INITIAL': 't_ANY_error'}
diff --git a/xpcom/idl-parser/xpidlyacc.py b/xpcom/idl-parser/xpidlyacc.py
deleted file mode 100644
index 679402ee34b..00000000000
--- a/xpcom/idl-parser/xpidlyacc.py
+++ /dev/null
@@ -1,85 +0,0 @@
-
-# /src/trunk/mozilla/xpcom/idl-parser/xpidlyacc.py
-# This file is automatically generated. Do not edit.
-_tabversion = '3.2'
-
-_lr_method = 'LALR'
-
-_lr_signature = ',Q\xe7:m\xcf|\xa4\x8ad\x0f\x06\xc1Q\x1f\x99'
-    
-_lr_action_items = {'CONST':([6,25,42,47,48,82,84,104,],[14,14,45,45,-28,-29,-41,-42,]),'NATIVEID':([43,],[50,]),'NUMBER':([62,65,66,77,78,79,80,81,83,],[68,68,68,68,68,68,68,68,68,]),'LSHIFT':([67,68,69,70,75,76,92,93,94,95,96,97,98,],[80,-30,-32,-31,80,-34,-33,-35,-37,-36,-38,-39,80,]),'RSHIFT':([67,68,69,70,75,76,92,93,94,95,96,97,98,],[81,-30,-32,-31,81,-34,-33,-35,-37,-36,-38,-39,81,]),'INOUT':([28,64,74,85,],[-13,-14,90,-14,]),'NATIVE':([0,2,5,7,8,9,10,28,31,44,61,],[-14,-14,-14,-14,-14,-14,23,-13,-8,-21,-9,]),')':([33,34,50,64,68,69,70,72,73,75,76,86,92,93,94,95,96,97,98,99,103,106,107,108,111,],[38,39,57,-44,-30,-32,-31,-45,87,92,-34,-43,-33,-35,-37,-36,-38,-39,-40,-45,-46,-47,109,-55,-56,]),'(':([14,16,17,30,37,60,62,65,66,77,78,79,80,81,83,101,],[-12,27,-11,-10,43,64,65,65,65,65,65,65,65,65,65,105,]),'+':([67,68,69,70,75,76,92,93,94,95,96,97,98,],[77,-30,-32,-31,77,-34,-33,-35,-37,-36,77,77,77,]),'*':([67,68,69,70,75,76,92,93,94,95,96,97,98,],[78,-30,-32,-31,78,-34,-33,78,-37,78,78,78,78,]),'-':([62,65,66,67,68,69,70,75,76,77,78,79,80,81,83,92,93,94,95,96,97,98,],[66,66,66,79,-30,-32,-31,79,-34,66,66,66,66,66,66,-33,-35,-37,-36,79,79,79,]),',':([14,15,16,17,26,38,39,72,99,106,108,],[-12,25,-20,-11,-17,-18,-19,85,85,-47,110,]),'IID':([27,],[34,]),'READONLY':([28,42,47,48,49,82,84,104,],[-13,-14,-14,-28,55,-29,-41,-42,]),';':([24,29,36,40,41,52,57,67,68,69,70,71,76,87,92,93,94,95,96,97,98,100,109,],[31,-25,-23,-24,44,-22,61,82,-30,-32,-31,84,-34,-54,-33,-35,-37,-36,-38,-39,-40,104,-53,]),'IDENTIFIER':([3,6,12,22,23,25,27,28,35,42,45,47,48,49,51,56,59,62,63,65,66,77,78,79,80,81,82,83,84,88,89,90,91,102,104,105,110,],[12,17,24,29,30,17,33,-13,40,-14,51,-14,-28,56,58,60,63,69,71,69,69,69,69,69,69,69,-29,69,-41,102,-48,-49,-50,106,-42,108,108,]),'=':([58,],[62,]),'OUT':([28,64,74,85,],[-13,-14,91,-14,]),'TYPEDEF':([0,2,5,7,8,9,31,44,61,],[3,3,3,3,3,3,-8,-21,-9,]),'RAISES':([87,],[101,]),'IN':([28,64,74,85,],[-13,-14,89,-14,]),'[':([0,2,5,7,8,9,31,42,44,47,48,61,64,82,84,85,104,],[6,6,6,6,6,6,-8,6,-21,6,-28,-9,6,-29,-41,6,-42,]),'INCLUDE':([0,2,5,7,8,9,31,44,61,],[7,7,7,7,7,7,-8,-21,-9,]),']':([14,15,16,17,18,26,32,38,39,],[-12,-15,-20,-11,28,-17,-16,-18,-19,]),':':([29,],[35,]),'ATTRIBUTE':([28,42,47,48,49,54,55,82,84,104,],[-13,-14,-14,-28,-52,59,-51,-29,-41,-42,]),'CDATA':([0,2,5,7,8,9,31,42,44,47,48,61,82,84,104,],[9,9,9,9,9,9,-8,48,-21,48,-28,-9,-29,-41,-42,]),'INTERFACE':([0,2,5,7,8,9,10,28,31,44,61,],[-14,-14,-14,-14,-14,-14,22,-13,-8,-21,-9,]),'{':([29,36,40,],[-25,42,-24,]),'$end':([0,1,2,4,5,7,8,9,11,13,19,20,21,31,44,61,],[-2,-1,-2,0,-2,-2,-2,-2,-6,-5,-4,-7,-3,-8,-21,-9,]),'}':([42,46,47,48,53,82,84,104,],[-26,52,-26,-28,-27,-29,-41,-42,]),'|':([67,68,69,70,75,76,92,93,94,95,96,97,98,],[83,-30,-32,-31,83,-34,-33,-35,-37,-36,-38,-39,-40,]),'HEXNUM':([62,65,66,77,78,79,80,81,83,],[70,70,70,70,70,70,70,70,70,]),}
-
-_lr_action = { }
-for _k, _v in _lr_action_items.items():
-   for _x,_y in zip(_v[0],_v[1]):
-      if not _x in _lr_action:  _lr_action[_x] = { }
-      _lr_action[_x][_k] = _y
-del _lr_action_items
-
-_lr_goto_items = {'members':([42,47,],[46,53,]),'attribute':([6,25,],[15,15,]),'number':([62,65,66,77,78,79,80,81,83,],[67,75,76,93,94,95,96,97,98,]),'productions':([0,2,5,7,8,9,],[1,11,13,19,20,21,]),'raises':([87,],[100,]),'ifacebody':([36,],[41,]),'attlist':([6,25,],[18,32,]),'native':([0,2,5,7,8,9,],[8,8,8,8,8,8,]),'typedef':([0,2,5,7,8,9,],[2,2,2,2,2,2,]),'attributeval':([16,],[26,]),'optreadonly':([49,],[54,]),'ifacebase':([29,],[36,]),'afternativeid':([30,],[37,]),'param':([64,85,],[72,99,]),'member':([42,47,],[47,47,]),'idlfile':([0,],[4,]),'paramlist':([64,],[73,]),'moreparams':([72,99,],[86,103,]),'interface':([0,2,5,7,8,9,],[5,5,5,5,5,5,]),'idlist':([105,110,],[107,111,]),'paramtype':([74,],[88,]),'anyident':([6,25,],[16,16,]),'attributes':([0,2,5,7,8,9,42,47,64,85,],[10,10,10,10,10,10,49,49,74,74,]),}
-
-_lr_goto = { }
-for _k, _v in _lr_goto_items.items():
-   for _x,_y in zip(_v[0],_v[1]):
-       if not _x in _lr_goto: _lr_goto[_x] = { }
-       _lr_goto[_x][_k] = _y
-del _lr_goto_items
-_lr_productions = [
-  ("S' -> idlfile","S'",1,None,None,None),
-  ('idlfile -> productions','idlfile',1,'p_idlfile','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1088),
-  ('productions -> <empty>','productions',0,'p_productions_start','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1092),
-  ('productions -> CDATA productions','productions',2,'p_productions_cdata','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1096),
-  ('productions -> INCLUDE productions','productions',2,'p_productions_include','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1101),
-  ('productions -> interface productions','productions',2,'p_productions_interface','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1106),
-  ('productions -> typedef productions','productions',2,'p_productions_interface','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1107),
-  ('productions -> native productions','productions',2,'p_productions_interface','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1108),
-  ('typedef -> TYPEDEF IDENTIFIER IDENTIFIER ;','typedef',4,'p_typedef','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1113),
-  ('native -> attributes NATIVE IDENTIFIER afternativeid ( NATIVEID ) ;','native',8,'p_native','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1120),
-  ('afternativeid -> <empty>','afternativeid',0,'p_afternativeid','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1127),
-  ('anyident -> IDENTIFIER','anyident',1,'p_anyident','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1133),
-  ('anyident -> CONST','anyident',1,'p_anyident','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1134),
-  ('attributes -> [ attlist ]','attributes',3,'p_attributes','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1139),
-  ('attributes -> <empty>','attributes',0,'p_attributes','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1140),
-  ('attlist -> attribute','attlist',1,'p_attlist_start','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1148),
-  ('attlist -> attribute , attlist','attlist',3,'p_attlist_continue','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1152),
-  ('attribute -> anyident attributeval','attribute',2,'p_attribute','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1157),
-  ('attributeval -> ( IDENTIFIER )','attributeval',3,'p_attributeval','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1161),
-  ('attributeval -> ( IID )','attributeval',3,'p_attributeval','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1162),
-  ('attributeval -> <empty>','attributeval',0,'p_attributeval','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1163),
-  ('interface -> attributes INTERFACE IDENTIFIER ifacebase ifacebody ;','interface',6,'p_interface','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1168),
-  ('ifacebody -> { members }','ifacebody',3,'p_ifacebody','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1197),
-  ('ifacebody -> <empty>','ifacebody',0,'p_ifacebody','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1198),
-  ('ifacebase -> : IDENTIFIER','ifacebase',2,'p_ifacebase','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1203),
-  ('ifacebase -> <empty>','ifacebase',0,'p_ifacebase','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1204),
-  ('members -> <empty>','members',0,'p_members_start','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1209),
-  ('members -> member members','members',2,'p_members_continue','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1213),
-  ('member -> CDATA','member',1,'p_member_cdata','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1218),
-  ('member -> CONST IDENTIFIER IDENTIFIER = number ;','member',6,'p_member_const','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1222),
-  ('number -> NUMBER','number',1,'p_number_decimal','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1230),
-  ('number -> HEXNUM','number',1,'p_number_hex','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1235),
-  ('number -> IDENTIFIER','number',1,'p_number_identifier','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1240),
-  ('number -> ( number )','number',3,'p_number_paren','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1246),
-  ('number -> - number','number',2,'p_number_neg','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1250),
-  ('number -> number + number','number',3,'p_number_add','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1255),
-  ('number -> number - number','number',3,'p_number_add','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1256),
-  ('number -> number * number','number',3,'p_number_add','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1257),
-  ('number -> number LSHIFT number','number',3,'p_number_shift','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1268),
-  ('number -> number RSHIFT number','number',3,'p_number_shift','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1269),
-  ('number -> number | number','number',3,'p_number_bitor','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1278),
-  ('member -> attributes optreadonly ATTRIBUTE IDENTIFIER IDENTIFIER ;','member',6,'p_member_att','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1284),
-  ('member -> attributes IDENTIFIER IDENTIFIER ( paramlist ) raises ;','member',8,'p_member_method','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1300),
-  ('paramlist -> param moreparams','paramlist',2,'p_paramlist','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1315),
-  ('paramlist -> <empty>','paramlist',0,'p_paramlist','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1316),
-  ('moreparams -> <empty>','moreparams',0,'p_moreparams_start','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1324),
-  ('moreparams -> , param moreparams','moreparams',3,'p_moreparams_continue','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1328),
-  ('param -> attributes paramtype IDENTIFIER IDENTIFIER','param',4,'p_param','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1333),
-  ('paramtype -> IN','paramtype',1,'p_paramtype','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1341),
-  ('paramtype -> INOUT','paramtype',1,'p_paramtype','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1342),
-  ('paramtype -> OUT','paramtype',1,'p_paramtype','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1343),
-  ('optreadonly -> READONLY','optreadonly',1,'p_optreadonly','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1347),
-  ('optreadonly -> <empty>','optreadonly',0,'p_optreadonly','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1348),
-  ('raises -> RAISES ( idlist )','raises',4,'p_raises','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1355),
-  ('raises -> <empty>','raises',0,'p_raises','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1356),
-  ('idlist -> IDENTIFIER','idlist',1,'p_idlist','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1363),
-  ('idlist -> IDENTIFIER , idlist','idlist',3,'p_idlist_continue','/src/trunk/mozilla/xpcom/idl-parser/xpidl.py',1367),
-]
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp
index bd0d38139ba..7f4e9402438 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp
@@ -115,7 +115,7 @@ extern "C" {
             case nsXPTType::T_U64    : *((PRUint64*)d) = s->val.u64; d++;    break;
             case nsXPTType::T_FLOAT  : *((float*)   d) = s->val.f;           break;
             case nsXPTType::T_DOUBLE : *((double*)  d) = s->val.d;   d++;    break;
-            case nsXPTType::T_BOOL   : *((bool*)  d) = s->val.b;           break;
+            case nsXPTType::T_BOOL   : *((PRUint32*)d) = s->val.b;           break;
             case nsXPTType::T_CHAR   : *((PRUint32*)d) = s->val.c;           break;
             case nsXPTType::T_WCHAR  : *((wchar_t*) d) = s->val.wc;          break;
 
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
index a7ecfb7b7f2..c3db74a979c 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
@@ -119,7 +119,7 @@ extern "C" {
             case nsXPTType::T_U64    : *((PRUint64*)d) = s->val.u64; d++;    break;
             case nsXPTType::T_FLOAT  : *((float*)   d) = s->val.f;           break;
             case nsXPTType::T_DOUBLE : *((double*)  d) = s->val.d;   d++;    break;
-            case nsXPTType::T_BOOL   : *((bool*)  d) = s->val.b;           break;
+            case nsXPTType::T_BOOL   : *((PRUint32*)d) = s->val.b;           break;
             case nsXPTType::T_CHAR   : *((PRUint32*)d) = s->val.c;           break;
             // wchar_t is an int (32 bits) on NetBSD
             case nsXPTType::T_WCHAR  : *((wchar_t*) d) = s->val.wc;          break;
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_pa32.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_pa32.cpp
index e63027d72ba..088ef5e691f 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_pa32.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_pa32.cpp
@@ -166,7 +166,7 @@ invoke_copy_to_stack(PRUint32* d,
     case nsXPTType::T_U8    : *((PRUint32*) (dest)) = source->val.u8; break;
     case nsXPTType::T_U16   : *((PRUint32*) (dest)) = source->val.u16; break;
     case nsXPTType::T_U32   : *((PRUint32*) (dest)) = source->val.u32; break;
-    case nsXPTType::T_BOOL  : *((bool*)   (dest)) = source->val.b; break;
+    case nsXPTType::T_BOOL  : *((PRUint32*) (dest)) = source->val.b; break;
     case nsXPTType::T_CHAR  : *((PRUint32*) (dest)) = source->val.c; break;
     case nsXPTType::T_WCHAR : *((PRInt32*)  (dest)) = source->val.wc; break;
 
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix.cpp
index 6c450611dd7..5724d6c4211 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix.cpp
@@ -93,7 +93,7 @@ invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, nsXPTCVariant* s, double
             if(fpCount < 13)
                 l_fprData[fpCount++] = l_s->val.f;
             break;
-        case nsXPTType::T_BOOL   : *((bool*) l_d) = l_s->val.b;           break;
+        case nsXPTType::T_BOOL   : *((uint32*) l_d) = l_s->val.b;           break;
         case nsXPTType::T_CHAR   : *((uint32*) l_d) = l_s->val.c;           break;
         case nsXPTType::T_WCHAR  : *((int32*)  l_d) = l_s->val.wc;          break;
         default:
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_rhapsody.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_rhapsody.cpp
index 0ee2d2ba140..c374f32e9c7 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_rhapsody.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_rhapsody.cpp
@@ -122,8 +122,8 @@ invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, nsXPTCVariant* s, double
         			   if (fpCount < 13)
         			       fprData[fpCount++] = s->val.d;
         			   break;
-        case nsXPTType::T_BOOL   : *((bool*)  d) = s->val.b;           break;
-        case nsXPTType::T_CHAR   : *((PRInt32*)    d) = s->val.c;        break;
+        case nsXPTType::T_BOOL   : *((PRUint32*) d) = s->val.b;          break;
+        case nsXPTType::T_CHAR   : *((PRInt32*)  d) = s->val.c;          break;
         case nsXPTType::T_WCHAR  : *((PRUint32*) d) = s->val.wc;         break;
         default:
             // all the others are plain pointer types
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_netbsd.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_netbsd.cpp
index fbfd8846902..7ec57345fc2 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_netbsd.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_netbsd.cpp
@@ -138,13 +138,13 @@ invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, nsXPTCVariant* s)
 				   if (regCount < 5) regCount++;
                                    *((uint32*) l_d) = ((DU *)l_s)->lo;
                                    break;
-        case nsXPTType::T_U8     : *((uint32*)  l_d) = l_s->val.u8;          break;
+        case nsXPTType::T_U8     : *((uint32*) l_d) = l_s->val.u8;          break;
         case nsXPTType::T_U16    : *((uint32*) l_d) = l_s->val.u16;         break;
         case nsXPTType::T_U32    : *((uint32*) l_d) = l_s->val.u32;         break;
         case nsXPTType::T_FLOAT  : *((float*)  l_d) = l_s->val.f;           break;
-        case nsXPTType::T_BOOL   : *((bool*) l_d) = l_s->val.b;           break;
-        case nsXPTType::T_CHAR   : *((uint32*)   l_d) = l_s->val.c;           break;
-        case nsXPTType::T_WCHAR  : *((int32*)l_d) = l_s->val.wc;          break;
+        case nsXPTType::T_BOOL   : *((uint32*) l_d) = l_s->val.b;           break;
+        case nsXPTType::T_CHAR   : *((uint32*) l_d) = l_s->val.c;           break;
+        case nsXPTType::T_WCHAR  : *((int32*)  l_d) = l_s->val.wc;          break;
         default:
             // all the others are plain pointer types
             *((void**)l_d) = l_s->val.p;
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_openbsd.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_openbsd.cpp
index f6b01ab5ee8..45f31090e03 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_openbsd.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_openbsd.cpp
@@ -139,7 +139,7 @@ invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, nsXPTCVariant* s)
         case nsXPTType::T_U16    : *((uint32*) l_d) = l_s->val.u16;         break;
         case nsXPTType::T_U32    : *((uint32*) l_d) = l_s->val.u32;         break;
         case nsXPTType::T_FLOAT  : *((float*)  l_d) = l_s->val.f;           break;
-        case nsXPTType::T_BOOL   : *((bool*) l_d) = l_s->val.b;           break;
+        case nsXPTType::T_BOOL   : *((uint32*) l_d) = l_s->val.b;           break;
         case nsXPTType::T_CHAR   : *((uint32*) l_d) = l_s->val.c;           break;
         case nsXPTType::T_WCHAR  : *((int32*)  l_d) = l_s->val.wc;          break;
         default:
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_solaris.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_solaris.cpp
index fbfd8846902..7ec57345fc2 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_solaris.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_solaris.cpp
@@ -138,13 +138,13 @@ invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, nsXPTCVariant* s)
 				   if (regCount < 5) regCount++;
                                    *((uint32*) l_d) = ((DU *)l_s)->lo;
                                    break;
-        case nsXPTType::T_U8     : *((uint32*)  l_d) = l_s->val.u8;          break;
+        case nsXPTType::T_U8     : *((uint32*) l_d) = l_s->val.u8;          break;
         case nsXPTType::T_U16    : *((uint32*) l_d) = l_s->val.u16;         break;
         case nsXPTType::T_U32    : *((uint32*) l_d) = l_s->val.u32;         break;
         case nsXPTType::T_FLOAT  : *((float*)  l_d) = l_s->val.f;           break;
-        case nsXPTType::T_BOOL   : *((bool*) l_d) = l_s->val.b;           break;
-        case nsXPTType::T_CHAR   : *((uint32*)   l_d) = l_s->val.c;           break;
-        case nsXPTType::T_WCHAR  : *((int32*)l_d) = l_s->val.wc;          break;
+        case nsXPTType::T_BOOL   : *((uint32*) l_d) = l_s->val.b;           break;
+        case nsXPTType::T_CHAR   : *((uint32*) l_d) = l_s->val.c;           break;
+        case nsXPTType::T_WCHAR  : *((int32*)  l_d) = l_s->val.wc;          break;
         default:
             // all the others are plain pointer types
             *((void**)l_d) = l_s->val.p;
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparcv9_solaris.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparcv9_solaris.cpp
index 1fc414ee536..1cc5fe508fc 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparcv9_solaris.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparcv9_solaris.cpp
@@ -92,7 +92,7 @@ invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
       */
       case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
       case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-      case nsXPTType::T_BOOL  : *((bool*)l_d)      = l_s->val.b;     break;
+      case nsXPTType::T_BOOL  : *((PRUint64*)l_d)    = l_s->val.b;     break;
       case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
       case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
 
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp
index c396dcc2775..c8e583d33b5 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp
@@ -95,7 +95,7 @@ extern "C" {
             case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*)ap); ap++; break;
             case nsXPTType::T_FLOAT  : dp->val.f   = *((float*)   ap);       break;
             case nsXPTType::T_DOUBLE : dp->val.d   = *((double*)  ap); ap++; break;
-            case nsXPTType::T_BOOL   : dp->val.b   = *((bool*)  ap);       break;
+            case nsXPTType::T_BOOL   : dp->val.b   = *((PRUint32* ap);       break;
             case nsXPTType::T_CHAR   : dp->val.c   = *(((char*)   ap) + 3);  break;
             case nsXPTType::T_WCHAR  : dp->val.wc  = *((wchar_t*) ap);       break;
             default:
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
index 046178fa068..546598a5c29 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
@@ -102,7 +102,7 @@ extern "C" {
             case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*)ap); ap++; break;
             case nsXPTType::T_FLOAT  : dp->val.f   = *((float*)   ap);       break;
             case nsXPTType::T_DOUBLE : dp->val.d   = *((double*)  ap); ap++; break;
-            case nsXPTType::T_BOOL   : dp->val.b   = *((bool*)  ap);       break;
+            case nsXPTType::T_BOOL   : dp->val.b   = *(((char*)   ap) + 3);  break;
             case nsXPTType::T_CHAR   : dp->val.c   = *(((char*)   ap) + 3);  break;
             // wchar_t is an int (32 bits) on NetBSD
             case nsXPTType::T_WCHAR  : dp->val.wc  = *((wchar_t*) ap);       break;
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp
index 4d28f986154..288d4b8ddb0 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp
@@ -138,7 +138,7 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex,
     case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*) args); break;
     case nsXPTType::T_U16    : dp->val.u16 = *((PRUint32*) args); break;
     case nsXPTType::T_U32    : dp->val.u32 = *((PRUint32*) args); break;
-    case nsXPTType::T_BOOL   : dp->val.b   = *((bool*)   args); break;
+    case nsXPTType::T_BOOL   : dp->val.b   = *((PRUint32*) args); break;
     case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*) args); break;
     case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt32*)  args); break;
     default:
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_netbsd.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_netbsd.cpp
index bfd6cb25d7b..89892c00fed 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_netbsd.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_netbsd.cpp
@@ -102,12 +102,12 @@ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, uint32* args)
                                    ((DU *)dp)->lo = ((DU *)ap)->lo;
                                    ap++;
                                    break;
-        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*) ap);       break;
+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*)ap);       break;
         case nsXPTType::T_U16    : dp->val.u16 = *((PRUint32*)ap);       break;
         case nsXPTType::T_U32    : dp->val.u32 = *((PRUint32*)ap);       break;
         case nsXPTType::T_FLOAT  : dp->val.f   = *((float*)   ap);       break;
-        case nsXPTType::T_BOOL   : dp->val.b   = *((bool*)  ap);       break;
-        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*) ap);       break;
+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRUint32*)ap);       break;
+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*)ap);       break;
         case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt32*) ap);       break;
         default:
             NS_ERROR("bad type");
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_openbsd.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_openbsd.cpp
index 1ec53cf6edd..55d27d2c1e2 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_openbsd.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_openbsd.cpp
@@ -105,12 +105,12 @@ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, uint32* args)
                                    ((DU *)dp)->lo = ((DU *)ap)->lo;
                                    ap++;
                                    break;
-        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*) ap);       break;
+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*)ap);       break;
         case nsXPTType::T_U16    : dp->val.u16 = *((PRUint32*)ap);       break;
         case nsXPTType::T_U32    : dp->val.u32 = *((PRUint32*)ap);       break;
         case nsXPTType::T_FLOAT  : dp->val.f   = *((float*)   ap);       break;
-        case nsXPTType::T_BOOL   : dp->val.b   = *((bool*)  ap);       break;
-        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*) ap);       break;
+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRUint32*)ap);       break;
+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*)ap);       break;
         case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt32*) ap);       break;
         default:
             NS_ERROR("bad type");
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_solaris.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_solaris.cpp
index fe9e63f9e4b..32e82f7233e 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_solaris.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_solaris.cpp
@@ -99,12 +99,12 @@ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, uint32* args)
                                    ((DU *)dp)->lo = ((DU *)ap)->lo;
                                    ap++;
                                    break;
-        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*) ap);       break;
+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*)ap);       break;
         case nsXPTType::T_U16    : dp->val.u16 = *((PRUint32*)ap);       break;
         case nsXPTType::T_U32    : dp->val.u32 = *((PRUint32*)ap);       break;
         case nsXPTType::T_FLOAT  : dp->val.f   = *((float*)   ap);       break;
-        case nsXPTType::T_BOOL   : dp->val.b   = *((bool*)  ap);       break;
-        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*) ap);       break;
+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRUint32*)ap);       break;
+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*)ap);       break;
         case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt32*) ap);       break;
         default:
             NS_ERROR("bad type");
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparcv9_solaris.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparcv9_solaris.cpp
index f5db6d054be..f966c8cb983 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparcv9_solaris.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparcv9_solaris.cpp
@@ -86,19 +86,19 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
         // else
         switch(type)
         {
-        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt32*)  ap);      break;
-        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt32*) ap);       break;
-        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt32*) ap);       break;
-        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*) ap);       break;
+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*)  ap);       break;
+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*)ap);       break;
         case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint32*) ap);      break;
-        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint32*)ap);       break;
-        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint32*)ap);       break;
-        case nsXPTType::T_FLOAT  : dp->val.f   = *((float*)   ap);       break;
-        case nsXPTType::T_BOOL   : dp->val.b   = *((bool*)  ap);       break;
-        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint32*) ap);      break;
-        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt32*) ap);       break;
+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*)ap);       break;
+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
+        case nsXPTType::T_FLOAT  : dp->val.f   =  ((float*)   ap)[1];    break;
+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRUint64*)ap);       break;
+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*)ap);       break;
+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
         default:
             NS_ERROR("bad type");
             break;
diff --git a/xpcom/reflect/xptinfo/public/nsIInterfaceInfo.idl b/xpcom/reflect/xptinfo/public/nsIInterfaceInfo.idl
index edad37eba3e..833fbc1b816 100644
--- a/xpcom/reflect/xptinfo/public/nsIInterfaceInfo.idl
+++ b/xpcom/reflect/xptinfo/public/nsIInterfaceInfo.idl
@@ -58,7 +58,7 @@ class nsXPTType;
 %}
 
 /* this is NOT intended to be scriptable */
-[uuid(7de126a2-ef4b-4e3b-a952-78ce4c133e38)]
+[uuid(1affa260-8965-4612-869a-78af4ccfb287)]
 interface nsIInterfaceInfo : nsISupports
 {
     readonly attribute string   name;
@@ -115,10 +115,6 @@ interface nsIInterfaceInfo : nsISupports
                                        [const] in nsXPTParamInfoPtr param,
                                        in PRUint16 dimension);
 
-    PRUint8 getLengthIsArgNumberForParam(in PRUint16 methodIndex, 
-                                         [const] in nsXPTParamInfoPtr param,
-                                         in PRUint16 dimension);
-
     PRUint8 getInterfaceIsArgNumberForParam(in PRUint16 methodIndex, 
                                             [const] in nsXPTParamInfoPtr param);
 
diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
index 2d3659bbf50..29289b357b1 100644
--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
@@ -484,52 +484,6 @@ xptiInterfaceEntry::GetSizeIsArgNumberForParam(uint16 methodIndex,
     return NS_OK;
 }
 
-nsresult
-xptiInterfaceEntry::GetLengthIsArgNumberForParam(uint16 methodIndex,
-                                                 const nsXPTParamInfo* param,
-                                                 uint16 dimension,
-                                                 uint8* argnum)
-{
-    if(!EnsureResolved())
-        return NS_ERROR_UNEXPECTED;
-
-    if(methodIndex < mMethodBaseIndex)
-        return mParent->
-            GetLengthIsArgNumberForParam(methodIndex, param, dimension, argnum);
-
-    if(methodIndex >= mMethodBaseIndex + 
-                      mDescriptor->num_methods)
-    {
-        NS_ERROR("bad index");
-        return NS_ERROR_INVALID_ARG;
-    }
-
-    const XPTTypeDescriptor *td;
-
-    if(dimension) {
-        nsresult rv = GetTypeInArray(param, dimension, &td);
-        if(NS_FAILED(rv)) {
-            return rv;
-        }
-    }
-    else
-        td = &param->type;
-
-    // verify that this is a type that has length_is
-    switch (XPT_TDP_TAG(td->prefix)) {
-      case TD_ARRAY:
-      case TD_PSTRING_SIZE_IS:
-      case TD_PWSTRING_SIZE_IS:
-        break;
-      default:
-        NS_ERROR("not a length_is");
-        return NS_ERROR_INVALID_ARG;
-    }
-
-    *argnum = td->argnum2;
-    return NS_OK;
-}
-
 nsresult
 xptiInterfaceEntry::GetInterfaceIsArgNumberForParam(uint16 methodIndex,
                                                     const nsXPTParamInfo* param,
diff --git a/xpcom/reflect/xptinfo/src/xptiprivate.h b/xpcom/reflect/xptinfo/src/xptiprivate.h
index c086e485b8d..806e2306953 100644
--- a/xpcom/reflect/xptinfo/src/xptiprivate.h
+++ b/xpcom/reflect/xptinfo/src/xptiprivate.h
@@ -307,7 +307,6 @@ public:
     nsresult GetIIDForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID * *_retval);
     nsresult GetTypeForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, nsXPTType *_retval);
     nsresult GetSizeIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval);
-    nsresult GetLengthIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval);
     nsresult GetInterfaceIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint8 *_retval);
     nsresult IsIID(const nsIID * IID, bool *_retval);
     nsresult GetNameShared(const char **name);
@@ -389,7 +388,6 @@ public:
     NS_IMETHOD GetIIDForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, nsIID * *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetIIDForParam(methodIndex, param, _retval); }
     NS_IMETHOD GetTypeForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, nsXPTType *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetTypeForParam(methodIndex, param, dimension, _retval); }
     NS_IMETHOD GetSizeIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetSizeIsArgNumberForParam(methodIndex, param, dimension, _retval); }
-    NS_IMETHOD GetLengthIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint16 dimension, PRUint8 *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetLengthIsArgNumberForParam(methodIndex, param, dimension, _retval); }
     NS_IMETHOD GetInterfaceIsArgNumberForParam(PRUint16 methodIndex, const nsXPTParamInfo * param, PRUint8 *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetInterfaceIsArgNumberForParam(methodIndex, param, _retval); }
     NS_IMETHOD IsIID(const nsIID * IID, bool *_retval) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->IsIID(IID, _retval); }
     NS_IMETHOD GetNameShared(const char **name) { return !mEntry ? NS_ERROR_UNEXPECTED : mEntry->GetNameShared(name); }
diff --git a/xpcom/tests/TestHarness.h b/xpcom/tests/TestHarness.h
index 1884c1292ac..18c2e217308 100644
--- a/xpcom/tests/TestHarness.h
+++ b/xpcom/tests/TestHarness.h
@@ -194,8 +194,9 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2
     {
       // If we created a profile directory, we need to remove it.
       if (mProfD) {
-        if (NS_FAILED(mProfD->Remove(true)))
-          NS_WARNING("Problem removing profile direrctory");
+        if (NS_FAILED(mProfD->Remove(true))) {
+          NS_WARNING("Problem removing profile directory");
+        }
 
         mProfD = nsnull;
       }
diff --git a/xpcom/typelib/xpidl/Makefile.in b/xpcom/typelib/xpidl/Makefile.in
index 4e0957441a5..cffceeea9c0 100644
--- a/xpcom/typelib/xpidl/Makefile.in
+++ b/xpcom/typelib/xpidl/Makefile.in
@@ -46,8 +46,6 @@ MODULE		= xpcom
 
 SDK_BINARY = \
   $(topsrcdir)/xpcom/idl-parser/xpidl.py \
-  $(topsrcdir)/xpcom/idl-parser/xpidllex.py \
-  $(topsrcdir)/xpcom/idl-parser/xpidlyacc.py \
   $(topsrcdir)/xpcom/idl-parser/header.py \
   $(topsrcdir)/xpcom/idl-parser/typelib.py \
   $(NULL)