From 5845c4644a2919a7868d7a6d1a6e3c7596f0f07c Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Wed, 18 Jul 2012 14:18:46 -0700
Subject: [PATCH 001/118] Bug 769594: Make nsObjectLoadingContent use
 TestPermissionFromPrincipal. r=mounir

---
 content/base/src/nsObjectLoadingContent.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 0e9ab52566c..bd9b423f3a1 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -496,19 +496,24 @@ nsresult nsObjectLoadingContent::IsPluginEnabledForType(const nsCString& aMIMETy
     rv = topWindow->GetDocument(getter_AddRefs(topDocument));
     NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIDocument> topDoc = do_QueryInterface(topDocument);
-    nsIURI* topUri = topDoc->GetDocumentURI();
 
     nsCOMPtr<nsIPermissionManager> permissionManager = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
-    PRUint32 permission;
-    rv = permissionManager->TestPermission(topUri, "plugins", &permission);
-    NS_ENSURE_SUCCESS(rv, rv);
+    bool allowPerm = false;
+    if (!nsContentUtils::IsSystemPrincipal(topDoc->NodePrincipal())) {
+      PRUint32 permission;
+      rv = permissionManager->TestPermissionFromPrincipal(topDoc->NodePrincipal(),
+                                                          "plugins",
+                                                          &permission);
+      NS_ENSURE_SUCCESS(rv, rv);
+      allowPerm = permission == nsIPermissionManager::ALLOW_ACTION;
+    }
 
     PRUint32 state;
     rv = pluginHost->GetBlocklistStateForType(aMIMEType.get(), &state);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    if (permission == nsIPermissionManager::ALLOW_ACTION &&
+    if (allowPerm &&
         state != nsIBlocklistService::STATE_VULNERABLE_UPDATE_AVAILABLE &&
         state != nsIBlocklistService::STATE_VULNERABLE_NO_UPDATE) {
       mCTPPlayable = true;

From 14a82646a545f5ae7032b2681153210f14694299 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <mixedpuppy@gmail.com>
Date: Wed, 18 Jul 2012 11:40:05 -0700
Subject: [PATCH 002/118] Bug 755136: implement social sidebar, r=gavin

--HG--
extra : rebase_source : 5545f8120d9fc3cea168007bbedde7ba30efdaa9
---
 browser/app/profile/firefox.js                |   3 +-
 browser/base/content/browser-sets.inc         |   2 +
 browser/base/content/browser-social.js        |  65 ++++-
 browser/base/content/browser.xul              |  17 ++
 browser/base/content/test/Makefile.in         |   1 +
 .../base/content/test/browser_shareButton.js  |   1 -
 .../content/test/browser_social_sidebar.js    |  74 ++++++
 .../content/test/browser_social_toolbar.js    |  11 +-
 .../locales/en-US/chrome/browser/browser.dtd  |   2 +
 browser/modules/Social.jsm                    |   9 +-
 toolkit/components/social/SocialService.jsm   | 224 +++++++++---------
 11 files changed, 284 insertions(+), 125 deletions(-)
 create mode 100644 browser/base/content/test/browser_social_sidebar.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 1616359f358..0107c6600d4 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1184,4 +1184,5 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
 pref("image.mem.max_decoded_image_kb", 256000);
 
 // Example social provider
-pref("social.manifest.motown", "{\"origin\":\"https://motown-dev.mozillalabs.com\",\"name\":\"MoTown\",\"workerURL\":\"https://motown-dev.mozillalabs.com/social/worker.js\",\"iconURL\":\"https://motown-dev.mozillalabs.com/images/motown-icon.png\"}");
+pref("social.manifest.motown", "{\"origin\":\"https://motown-dev.mozillalabs.com\",\"name\":\"MoTown\",\"workerURL\":\"https://motown-dev.mozillalabs.com/social/worker.js\",\"iconURL\":\"https://motown-dev.mozillalabs.com/images/motown-icon.png\",\"sidebarURL\":\"https://motown-dev.mozillalabs.com/social/sidebar\"}");
+pref("social.sidebar.open", true);
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 4d8404ef59b..649526c09d5 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -107,6 +107,7 @@
     <command id="Browser:ToggleAddonBar" oncommand="toggleAddonBar();"/>
     <command id="Social:SharePage" oncommand="SocialShareButton.sharePage();"/>
     <command id="Social:UnsharePage" oncommand="SocialShareButton.unsharePage();"/>
+    <command id="Social:ToggleSidebar" oncommand="Social.toggleSidebar();"/>
   </commandset>
 
   <commandset id="placesCommands">
@@ -181,6 +182,7 @@
     <broadcaster id="sync-syncnow-state"/>
 #endif
     <broadcaster id="workOfflineMenuitemState"/>
+    <broadcaster id="socialSidebarBroadcaster" hidden="true"/>
   </broadcasterset>
 
   <keyset id="mainKeyset">
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index b6055bd8476..1a08ff75449 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -9,6 +9,8 @@ let SocialUI = {
     Services.obs.addObserver(this, "social:ambient-notification-changed", false);
     Services.obs.addObserver(this, "social:profile-changed", false);
 
+    Services.prefs.addObserver("social.sidebar.open", this, false);
+
     Social.init(this._providerReady.bind(this));
   },
 
@@ -17,6 +19,8 @@ let SocialUI = {
     Services.obs.removeObserver(this, "social:pref-changed");
     Services.obs.removeObserver(this, "social:ambient-notification-changed");
     Services.obs.removeObserver(this, "social:profile-changed");
+
+    Services.prefs.removeObserver("social.sidebar.open", this);
   },
 
   showProfile: function SocialUI_showProfile() {
@@ -29,6 +33,7 @@ let SocialUI = {
       case "social:pref-changed":
         SocialShareButton.updateButtonHiddenState();
         SocialToolbar.updateButtonHiddenState();
+        SocialSidebar.updateSidebar();
         break;
       case "social:ambient-notification-changed":
         SocialToolbar.updateButton();
@@ -36,6 +41,8 @@ let SocialUI = {
       case "social:profile-changed":
         SocialToolbar.updateProfile();
         break;
+      case "nsPref:changed":
+        SocialSidebar.updateSidebar();
     }
   },
 
@@ -43,12 +50,13 @@ let SocialUI = {
   _providerReady: function SocialUI_providerReady() {
     SocialToolbar.init();
     SocialShareButton.init();
+    SocialSidebar.init();
   }
 }
 
 let SocialShareButton = {
+  // Called once, after window load, when the Social.provider object is initialized
   init: function SSB_init() {
-    this.sharePopup.hidden = false;
     this.updateButtonHiddenState();
 
     let profileRow = document.getElementById("editSharePopupHeader");
@@ -98,6 +106,8 @@ let SocialShareButton = {
   },
 
   sharePage: function SSB_sharePage() {
+    this.sharePopup.hidden = false;
+
     let uri = gBrowser.currentURI;
     if (!Social.isPageShared(uri)) {
       Social.sharePage(uri);
@@ -248,9 +258,60 @@ var SocialToolbar = {
       notifBrowser.setAttribute("src", "about:blank");
     });
 
-    notifBrowser.service = Social.provider;
+    notifBrowser.setAttribute("origin", Social.provider.origin);
     notifBrowser.setAttribute("src", iconImage.getAttribute("contentPanel"));
     document.getElementById("social-toolbar-button").setAttribute("open", "true");
     panel.openPopup(iconImage, "bottomcenter topleft", 0, 0, false, false);
   }
 }
+
+var SocialSidebar = {
+  // Called once, after window load, when the Social.provider object is initialized
+  init: function SocialSidebar_init() {
+    this.updateSidebar();
+  },
+
+  // Whether the sidebar can be shown for this window.
+  get canShow() {
+    return Social.uiVisible && Social.provider.sidebarURL && !this.chromeless;
+  },
+
+  // Whether this is a "chromeless window" (e.g. popup window). We don't show
+  // the sidebar in these windows.
+  get chromeless() {
+    let docElem = document.documentElement;
+    return docElem.getAttribute('disablechrome') ||
+           docElem.getAttribute('chromehidden').indexOf("extrachrome") >= 0;
+  },
+
+  // Whether the user has toggled the sidebar on (for windows where it can appear)
+  get enabled() {
+    return Services.prefs.getBoolPref("social.sidebar.open");
+  },
+
+  updateSidebar: function SocialSidebar_updateSidebar() {
+    // Hide the toggle menu item if the sidebar cannot appear
+    let command = document.getElementById("Social:ToggleSidebar");
+    command.hidden = !this.canShow;
+
+    // Hide the sidebar if it cannot appear, or has been toggled off.
+    // Also set the command "checked" state accordingly.
+    let hideSidebar = !this.canShow || !this.enabled;
+    let broadcaster = document.getElementById("socialSidebarBroadcaster");
+    broadcaster.hidden = hideSidebar;
+    command.setAttribute("checked", !hideSidebar);
+
+    // If the sidebar is hidden, unload its document
+    // XXX this results in a poor UX, we should revisit
+    let sbrowser = document.getElementById("social-sidebar-browser");
+    if (broadcaster.hidden) {
+      sbrowser.removeAttribute("origin");
+      sbrowser.setAttribute("src", "about:blank");
+      return;
+    }
+
+    // Load the sidebar document
+    sbrowser.setAttribute("origin", Social.provider.origin);
+    sbrowser.setAttribute("src", Social.provider.sidebarURL);
+  }
+}
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 20c4708acfc..bc395c96791 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -638,6 +638,12 @@
                           oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/>
                 </vbox>
               </hbox>
+              <menuitem id="social-toggle-sidebar-menuitem"
+                        type="checkbox"
+                        autocheck="false"
+                        command="Social:ToggleSidebar"
+                        label="&social.toggleSidebar.label;"
+                        accesskey="&social.toggleSidebar.accesskey;"/>
             </menupopup>
           </button>
           <hbox id="social-status-iconbox" flex="1">
@@ -1024,6 +1030,17 @@
                   onclick="contentAreaClick(event, false);"/>
       <statuspanel id="statusbar-display" inactive="true"/>
     </vbox>
+    <splitter id="social-sidebar-splitter"
+              class="chromeclass-extrachrome"
+              observes="socialSidebarBroadcaster"/>
+    <vbox id="social-sidebar-box"
+          class="chromeclass-extrachrome"
+          observes="socialSidebarBroadcaster">
+      <browser id="social-sidebar-browser"
+               type="content"
+               flex="1"
+               style="min-width: 14em; width: 18em; max-width: 36em;"/>
+    </vbox>
     <splitter id="devtools-side-splitter" hidden="true"/>
     <vbox id="devtools-sidebar-box" hidden="true"
           style="min-width: 18em; width: 22em; max-width: 42em;" persist="width">
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 06ceeefec87..8fb493063f8 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -257,6 +257,7 @@ _BROWSER_FILES = \
                  browser_lastAccessedTab.js \
                  browser_bug734076.js \
                  browser_social_toolbar.js \
+                 browser_social_sidebar.js \
                  $(NULL)
 
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/browser/base/content/test/browser_shareButton.js b/browser/base/content/test/browser_shareButton.js
index 9499940a561..c5037793c69 100644
--- a/browser/base/content/test/browser_shareButton.js
+++ b/browser/base/content/test/browser_shareButton.js
@@ -51,7 +51,6 @@ function testInitial() {
   sharePopup = SocialShareButton.sharePopup;
   ok(shareButton, "share button exists");
   ok(sharePopup, "share popup exists");
-  ok(!sharePopup.hidden, "share popup is not hidden");
 
   okButton = document.getElementById("editSharePopupOkButton");
   undoButton = document.getElementById("editSharePopupUndoButton");
diff --git a/browser/base/content/test/browser_social_sidebar.js b/browser/base/content/test/browser_social_sidebar.js
new file mode 100644
index 00000000000..f5a8b472822
--- /dev/null
+++ b/browser/base/content/test/browser_social_sidebar.js
@@ -0,0 +1,74 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+let SocialService = Cu.import("resource://gre/modules/SocialService.jsm", {}).SocialService;
+
+function test() {
+  waitForExplicitFinish();
+
+  let oldProvider;
+  function saveOldProviderAndStartTestWith(provider) {
+    oldProvider = Social.provider;
+    registerCleanupFunction(function () {
+      Social.provider = oldProvider;
+    });
+    Social.provider = provider;
+
+    // Now that we've set the UI's provider, enable the social functionality
+    Services.prefs.setBoolPref("social.enabled", true);
+    registerCleanupFunction(function () {
+      Services.prefs.clearUserPref("social.enabled");
+    });
+
+    doTest();
+  }
+
+  let manifest = { // normal provider
+    name: "provider 1",
+    origin: "https://example1.com",
+    sidebarURL: "https://example1.com/sidebar.html",
+    workerURL: "https://example1.com/worker.js",
+    iconURL: "chrome://branding/content/icon48.png"
+  };
+  SocialService.addProvider(manifest, function(provider) {
+    // If the UI is already active, run the test immediately, otherwise wait
+    // for initialization.
+    if (Social.provider) {
+      saveOldProviderAndStartTestWith(provider);
+    } else {
+      Services.obs.addObserver(function obs() {
+        Services.obs.removeObserver(obs, "test-social-ui-ready");
+        saveOldProviderAndStartTestWith(provider);
+      }, "test-social-ui-ready", false);
+    }
+  });
+}
+
+function doTest() {
+  ok(SocialSidebar.canShow, "social sidebar should be able to be shown");
+  ok(SocialSidebar.enabled, "social sidebar should be on by default");
+
+  let command = document.getElementById("Social:ToggleSidebar");
+  let sidebar = document.getElementById("social-sidebar-box");
+
+  // Check the the sidebar is initially visible, and loaded
+  ok(!command.hidden, "sidebar toggle command should be visible");
+  is(command.getAttribute("checked"), "true", "sidebar toggle command should be checked");
+  ok(!sidebar.hidden, "sidebar itself should be visible");
+  ok(Services.prefs.getBoolPref("social.sidebar.open"), "sidebar open pref should be true");
+  is(sidebar.firstChild.getAttribute('src'), "https://example1.com/sidebar.html", "sidebar url should be set");
+
+  // Now toggle it!
+  info("Toggling sidebar");
+  Social.toggleSidebar();
+  is(command.getAttribute("checked"), "false", "sidebar toggle command should not be checked");
+  ok(sidebar.hidden, "sidebar itself should not be visible");
+  ok(!Services.prefs.getBoolPref("social.sidebar.open"), "sidebar open pref should be false");
+  is(sidebar.firstChild.getAttribute('src'), "about:blank", "sidebar url should not be set");
+
+  // Remove the test provider
+  SocialService.removeProvider(Social.provider.origin, finish);
+}
+
+// XXX test sidebar in popup
diff --git a/browser/base/content/test/browser_social_toolbar.js b/browser/base/content/test/browser_social_toolbar.js
index f38092d1fad..afc043185de 100644
--- a/browser/base/content/test/browser_social_toolbar.js
+++ b/browser/base/content/test/browser_social_toolbar.js
@@ -8,11 +8,6 @@ let gProvider;
 function test() {
   waitForExplicitFinish();
 
-  Services.prefs.setBoolPref("social.enabled", true);
-  registerCleanupFunction(function () {
-    Services.prefs.clearUserPref("social.enabled");
-  });
-
   let oldProvider;
   function saveOldProviderAndStartTestWith(provider) {
     oldProvider = Social.provider;
@@ -20,6 +15,12 @@ function test() {
       Social.provider = oldProvider;
     });
     Social.provider = gProvider = provider;
+
+    Services.prefs.setBoolPref("social.enabled", true);
+    registerCleanupFunction(function () {
+      Services.prefs.clearUserPref("social.enabled");
+    });
+
     runTests(tests, undefined, undefined, function () {
       SocialService.removeProvider(provider.origin, finish);
     });
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 63457f26729..b646cba54ac 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -662,3 +662,5 @@ toolbar button -->
 <!ENTITY social.sharePopup.ok.accesskey   "O">
 <!ENTITY social.sharePopup.shared.label   "You shared this page.">
 <!ENTITY social.sharePopup.portrait.arialabel "User profile picture">
+<!ENTITY social.toggleSidebar.label "Show sidebar">
+<!ENTITY social.toggleSidebar.accesskey "s">
diff --git a/browser/modules/Social.jsm b/browser/modules/Social.jsm
index ea7a7ea57fb..23c4333016e 100644
--- a/browser/modules/Social.jsm
+++ b/browser/modules/Social.jsm
@@ -34,14 +34,15 @@ let Social = {
     }.bind(this));
   },
 
-  get enabled() {
-    return SocialService.enabled;
-  },
-
   get uiVisible() {
     return this.provider && this.provider.enabled && this.provider.port;
   },
 
+  toggleSidebar: function SocialSidebar_toggle() {
+    let prefValue = Services.prefs.getBoolPref("social.sidebar.open");
+    Services.prefs.setBoolPref("social.sidebar.open", !prefValue);
+  },
+
   sendWorkerMessage: function Social_sendWorkerMessage(message) {
     // Responses aren't handled yet because there is no actions to perform
     // based on the response from the provider at this point.
diff --git a/toolkit/components/social/SocialService.jsm b/toolkit/components/social/SocialService.jsm
index 0ec7b299944..f8460afdaa1 100644
--- a/toolkit/components/social/SocialService.jsm
+++ b/toolkit/components/social/SocialService.jsm
@@ -12,6 +12,117 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "getFrameWorkerHandle", "resource://gre/modules/FrameWorker.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "WorkerAPI", "resource://gre/modules/WorkerAPI.jsm");
 
+/**
+ * The SocialService is the public API to social providers - it tracks which
+ * providers are installed and enabled, and is the entry-point for access to
+ * the provider itself.
+ */
+
+// Internal helper methods and state
+let SocialServiceInternal = {
+  enabled: Services.prefs.getBoolPref("social.enabled"),
+  get providerArray() {
+    return [p for ([, p] of Iterator(this.providers))];
+  }
+};
+
+XPCOMUtils.defineLazyGetter(SocialServiceInternal, "providers", function () {
+  // Initialize the service (add a pref observer)
+  function prefObserver(subject, topic, data) {
+    SocialService._setEnabled(Services.prefs.getBoolPref(data));
+  }
+  Services.prefs.addObserver("social.enabled", prefObserver, false);
+  Services.obs.addObserver(function xpcomShutdown() {
+    Services.obs.removeObserver(xpcomShutdown, "xpcom-shutdown");
+    Services.prefs.removeObserver("social.enabled", prefObserver);
+  }, "xpcom-shutdown", false);
+
+  // Now retrieve the providers
+  let providers = {};
+  let MANIFEST_PREFS = Services.prefs.getBranch("social.manifest.");
+  let prefs = MANIFEST_PREFS.getChildList("", {});
+  prefs.forEach(function (pref) {
+    try {
+      var manifest = JSON.parse(MANIFEST_PREFS.getCharPref(pref));
+      if (manifest && typeof(manifest) == "object") {
+        let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
+        providers[provider.origin] = provider;
+      }
+    } catch (err) {
+      Cu.reportError("SocialService: failed to load provider: " + pref +
+                     ", exception: " + err);
+    }
+  });
+
+  return providers;
+});
+
+function schedule(callback) {
+  Services.tm.mainThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL);
+}
+
+// Public API
+const SocialService = {
+  get enabled() {
+    return SocialServiceInternal.enabled;
+  },
+  set enabled(val) {
+    let enable = !!val;
+    if (enable == SocialServiceInternal.enabled)
+      return;
+
+    Services.prefs.setBoolPref("social.enabled", enable);
+    this._setEnabled(enable);
+  },
+  _setEnabled: function _setEnabled(enable) {
+    SocialServiceInternal.providerArray.forEach(function (p) p.enabled = enable);
+    SocialServiceInternal.enabled = enable;
+    Services.obs.notifyObservers(null, "social:pref-changed", enable ? "enabled" : "disabled");
+  },
+
+  // Adds a provider given a manifest, and returns the added provider.
+  addProvider: function addProvider(manifest, onDone) {
+    if (SocialServiceInternal.providers[manifest.origin])
+      throw new Error("SocialService.addProvider: provider with this origin already exists");
+
+    let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
+    SocialServiceInternal.providers[provider.origin] = provider;
+
+    schedule(function () {
+      onDone(provider);
+    });
+  },
+
+  // Removes a provider with the given origin, and notifies when the removal is
+  // complete.
+  removeProvider: function removeProvider(origin, onDone) {
+    if (!(origin in SocialServiceInternal.providers))
+      throw new Error("SocialService.removeProvider: no provider with this origin exists!");
+
+    let provider = SocialServiceInternal.providers[origin];
+    provider.enabled = false;
+
+    delete SocialServiceInternal.providers[origin];
+
+    if (onDone)
+      schedule(onDone);
+  },
+
+  // Returns a single provider object with the specified origin.
+  getProvider: function getProvider(origin, onDone) {
+    schedule((function () {
+      onDone(SocialServiceInternal.providers[origin] || null);
+    }).bind(this));
+  },
+
+  // Returns an array of installed provider origins.
+  getProviderList: function getProviderList(onDone) {
+    schedule(function () {
+      onDone(SocialServiceInternal.providerArray);
+    });
+  }
+};
+
 /**
  * The SocialProvider object represents a social provider, and allows
  * access to its FrameWorker (if it has one).
@@ -29,6 +140,7 @@ function SocialProvider(input, enabled) {
   this.name = input.name;
   this.iconURL = input.iconURL;
   this.workerURL = input.workerURL;
+  this.sidebarURL = input.sidebarURL;
   this.origin = input.origin;
   this.ambientNotificationIcons = {};
 
@@ -153,115 +265,3 @@ SocialProvider.prototype = {
     }
   }
 }
-
-/**
- * The SocialService is the public API to social providers - it tracks which
- * providers are installed and enabled, and is the entry-point for access to
- * the provider itself.
- */
-
-
-// Internal helper methods and state
-let SocialServiceInternal = {
-  enabled: Services.prefs.getBoolPref("social.enabled"),
-  get providerArray() {
-    return [p for ([, p] of Iterator(this.providers))];
-  }
-};
-
-XPCOMUtils.defineLazyGetter(SocialServiceInternal, "providers", function () {
-  // Initialize the service (add a pref observer)
-  function prefObserver(subject, topic, data) {
-    SocialService._setEnabled(Services.prefs.getBoolPref(data));
-  }
-  Services.prefs.addObserver("social.enabled", prefObserver, false);
-  Services.obs.addObserver(function xpcomShutdown() {
-    Services.obs.removeObserver(xpcomShutdown, "xpcom-shutdown");
-    Services.prefs.removeObserver("social.enabled", prefObserver);
-  }, "xpcom-shutdown", false);
-
-  // Now retrieve the providers
-  let providers = {};
-  let MANIFEST_PREFS = Services.prefs.getBranch("social.manifest.");
-  let prefs = MANIFEST_PREFS.getChildList("", {});
-  prefs.forEach(function (pref) {
-    try {
-      var manifest = JSON.parse(MANIFEST_PREFS.getCharPref(pref));
-      if (manifest && typeof(manifest) == "object") {
-        let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
-        providers[provider.origin] = provider;
-      }
-    } catch (err) {
-      Cu.reportError("SocialService: failed to load provider: " + pref +
-                     ", exception: " + err);
-    }
-  });
-
-  return providers;
-});
-
-function schedule(callback) {
-  Services.tm.mainThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL);
-}
-
-// Public API
-const SocialService = {
-  get enabled() {
-    return SocialServiceInternal.enabled;
-  },
-  set enabled(val) {
-    let enable = !!val;
-    if (enable == SocialServiceInternal.enabled)
-      return;
-
-    Services.prefs.setBoolPref("social.enabled", enable);
-    this._setEnabled(enable);
-  },
-  _setEnabled: function _setEnabled(enable) {
-    SocialServiceInternal.providerArray.forEach(function (p) p.enabled = enable);
-    SocialServiceInternal.enabled = enable;
-    Services.obs.notifyObservers(null, "social:pref-changed", enable ? "enabled" : "disabled");
-  },
-
-  // Adds a provider given a manifest, and returns the added provider.
-  addProvider: function addProvider(manifest, onDone) {
-    if (SocialServiceInternal.providers[manifest.origin])
-      throw new Error("SocialService.addProvider: provider with this origin already exists");
-
-    let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
-    SocialServiceInternal.providers[provider.origin] = provider;
-
-    schedule(function () {
-      onDone(provider);
-    });
-  },
-
-  // Removes a provider with the given origin, and notifies when the removal is
-  // complete.
-  removeProvider: function removeProvider(origin, onDone) {
-    if (!(origin in SocialServiceInternal.providers))
-      throw new Error("SocialService.removeProvider: no provider with this origin exists!");
-
-    let provider = SocialServiceInternal.providers[origin];
-    provider.enabled = false;
-
-    delete SocialServiceInternal.providers[origin];
-
-    if (onDone)
-      schedule(onDone);
-  },
-
-  // Returns a single provider object with the specified origin.
-  getProvider: function getProvider(origin, onDone) {
-    schedule((function () {
-      onDone(SocialServiceInternal.providers[origin] || null);
-    }).bind(this));
-  },
-
-  // Returns an array of installed provider origins.
-  getProviderList: function getProviderList(onDone) {
-    schedule(function () {
-      onDone(SocialServiceInternal.providerArray);
-    });
-  }
-};

From dd3070363a22b622b353f40f63a5035e8c09cc0b Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Tue, 17 Jul 2012 16:35:58 -0700
Subject: [PATCH 003/118] Bug 761510 - rm JSFUN_NULL_CLOSURE (r=jimb)

---
 js/src/frontend/BytecodeEmitter.cpp  |  3 --
 js/src/frontend/SemanticAnalysis.cpp | 42 ++--------------------------
 js/src/jsfun.cpp                     |  5 ++--
 js/src/jsfun.h                       | 12 +-------
 js/src/methodjit/Compiler.cpp        |  4 +--
 js/src/shell/js.cpp                  |  3 --
 js/src/vm/Xdr.h                      |  2 +-
 7 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 1b096e58368..b1a4e0d1579 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -4852,9 +4852,6 @@ EmitFunc(JSContext *cx, BytecodeEmitter *bce, ParseNode *pn)
         return EmitFunctionDefNop(cx, bce, pn->pn_index);
     }
 
-    JS_ASSERT_IF(pn->pn_funbox->funIsHeavyweight(),
-                 fun->kind() == JSFUN_INTERPRETED);
-
     {
         FunctionBox *funbox = pn->pn_funbox;
         SharedContext sc(cx, /* scopeChain = */ NULL, fun, funbox, funbox->strictModeState);
diff --git a/js/src/frontend/SemanticAnalysis.cpp b/js/src/frontend/SemanticAnalysis.cpp
index b47c4419b5f..b1c457d99b5 100644
--- a/js/src/frontend/SemanticAnalysis.cpp
+++ b/js/src/frontend/SemanticAnalysis.cpp
@@ -56,46 +56,8 @@ SetFunctionKinds(FunctionBox *funbox, bool *isHeavyweight, bool topInFunction, b
             SetFunctionKinds(funbox->kids, isHeavyweight, topInFunction, isDirectEval);
 
         JSFunction *fun = funbox->function();
-
-        JS_ASSERT(fun->kind() == JSFUN_INTERPRETED);
-
-        if (funbox->funIsHeavyweight()) {
-            /* nothing to do */
-        } else if (isDirectEval || funbox->inAnyDynamicScope()) {
-            /*
-             * Either we are in a with-block or a function scope that is
-             * subject to direct eval; or we are compiling strict direct eval
-             * code.
-             *
-             * In either case, fun may reference names that are not bound but
-             * are not necessarily global either. (In the strict direct eval
-             * case, we could bind them, but currently do not bother; see
-             * the comment about strict mode code in BindTopLevelVar.)
-             */
-            JS_ASSERT(!fun->isNullClosure());
-        } else {
-            bool hasUpvars = false;
-
-            if (pn->isKind(PNK_UPVARS)) {
-                AtomDefnMapPtr upvars = pn->pn_names;
-                JS_ASSERT(!upvars->empty());
-
-                /* Determine whether the this function contains upvars. */
-                for (AtomDefnRange r = upvars->all(); !r.empty(); r.popFront()) {
-                    if (!r.front().value()->resolve()->isFreeVar()) {
-                        hasUpvars = true;
-                        break;
-                    }
-                }
-            }
-
-            if (!hasUpvars) {
-                /* No lexical dependencies => null closure, for best performance. */
-                fun->setKind(JSFUN_NULL_CLOSURE);
-            }
-        }
-
-        if (fun->kind() == JSFUN_INTERPRETED && pn->isKind(PNK_UPVARS)) {
+        JS_ASSERT(fun->isInterpreted());
+        if (pn->isKind(PNK_UPVARS)) {
             /*
              * We loop again over all upvars, and for each non-free upvar,
              * ensure that its containing function has been flagged as
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 2b5fe5a14ed..1d796a41bc9 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -387,7 +387,6 @@ js::XDRInterpretedFunction(XDRState<mode> *xdr, HandleObject enclosingScope, Han
 
     if (mode == XDR_DECODE) {
         fun->nargs = flagsword >> 16;
-        JS_ASSERT((flagsword & JSFUN_KINDMASK) >= JSFUN_INTERPRETED);
         fun->flags = uint16_t(flagsword);
         fun->atom.init(atom);
         fun->initScript(script);
@@ -1219,8 +1218,8 @@ js_NewFunction(JSContext *cx, JSObject *funobj, Native native, unsigned nargs,
 
     /* Initialize all function members. */
     fun->nargs = uint16_t(nargs);
-    fun->flags = flags & (JSFUN_FLAGS_MASK | JSFUN_KINDMASK);
-    if ((flags & JSFUN_KINDMASK) >= JSFUN_INTERPRETED) {
+    fun->flags = flags & (JSFUN_FLAGS_MASK | JSFUN_INTERPRETED);
+    if (flags & JSFUN_INTERPRETED) {
         JS_ASSERT(!native);
         fun->mutableScript().init(NULL);
         fun->initEnvironment(parent);
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 5d8040d5097..13f1235d8b9 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -40,9 +40,6 @@
 #define JSFUN_EXPR_CLOSURE  0x1000  /* expression closure: function(x) x*x */
 #define JSFUN_EXTENDED      0x2000  /* structure is FunctionExtended */
 #define JSFUN_INTERPRETED   0x4000  /* use u.i if kind >= this value else u.native */
-#define JSFUN_NULL_CLOSURE  0x8000  /* null closure entrains no scope chain */
-#define JSFUN_KINDMASK      0xc000  /* encode interp vs. native and closure
-                                       optimization level -- see above */
 
 namespace js { class FunctionExtended; }
 
@@ -65,21 +62,14 @@ struct JSFunction : public JSObject
 
     bool hasDefaults()       const { return flags & JSFUN_HAS_DEFAULTS; }
     bool hasRest()           const { return flags & JSFUN_HAS_REST; }
-    bool isInterpreted()     const { return kind() >= JSFUN_INTERPRETED; }
+    bool isInterpreted()     const { return flags & JSFUN_INTERPRETED; }
     bool isNative()          const { return !isInterpreted(); }
     bool isNativeConstructor() const { return flags & JSFUN_CONSTRUCTOR; }
     bool isHeavyweight()     const { return JSFUN_HEAVYWEIGHT_TEST(flags); }
-    bool isNullClosure()     const { return kind() == JSFUN_NULL_CLOSURE; }
     bool isFunctionPrototype() const { return flags & JSFUN_PROTOTYPE; }
     bool isInterpretedConstructor() const { return isInterpreted() && !isFunctionPrototype(); }
     bool isNamedLambda()     const { return (flags & JSFUN_LAMBDA) && atom; }
 
-    uint16_t kind()          const { return flags & JSFUN_KINDMASK; }
-    void setKind(uint16_t k) {
-        JS_ASSERT(!(k & ~JSFUN_KINDMASK));
-        flags = (flags & ~JSFUN_KINDMASK) | k;
-    }
-
     /* Returns the strictness of this function, which must be interpreted. */
     inline bool inStrictMode() const;
 
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index 180eb2a41cd..8ecf586463a 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -4243,8 +4243,8 @@ mjit::Compiler::inlineCallHelper(uint32_t argc, bool callingNew, FrameSize &call
 
         /* Test if the function is scripted. */
         stubcc.masm.load16(Address(icCalleeData, offsetof(JSFunction, flags)), tmp);
-        stubcc.masm.and32(Imm32(JSFUN_KINDMASK), tmp);
-        Jump isNative = stubcc.masm.branch32(Assembler::Below, tmp, Imm32(JSFUN_INTERPRETED));
+        Jump isNative = stubcc.masm.branchTest32(Assembler::Zero, tmp,
+                                                 Imm32(JSFUN_INTERPRETED));
         tempRegs.putReg(tmp);
 
         /*
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 34f2a332d1c..18009c44086 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1727,9 +1727,6 @@ DisassembleScript(JSContext *cx, JSScript *script_, JSFunction *fun, bool lines,
 
 #undef SHOW_FLAG
 
-        if (fun->isNullClosure())
-            Sprint(sp, " NULL_CLOSURE");
-
         Sprint(sp, "\n");
     }
 
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index ff56d06a48c..d3df60a48df 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -25,7 +25,7 @@ namespace js {
  * and saved versions. If deserialization fails, the data should be
  * invalidated if possible.
  */
-static const uint32_t XDR_BYTECODE_VERSION = uint32_t(0xb973c0de - 120);
+static const uint32_t XDR_BYTECODE_VERSION = uint32_t(0xb973c0de - 121);
 
 class XDRBuffer {
   public:

From 76b9d0010233eb9935d4ce2b515b520f731e52d3 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Sun, 8 Jul 2012 03:07:25 -0700
Subject: [PATCH 004/118] Bug 680562 - Remove CHECK_INTERRUPT_HANDLER (r=jimb)

---
 js/src/jsdbgapi.cpp      |  4 +++-
 js/src/jsinterp.cpp      | 47 ++++++++--------------------------------
 js/src/jsinterp.h        |  3 ++-
 js/src/jsinterpinlines.h |  2 +-
 4 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index 0cee41158bd..f7aa76b48b4 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -223,7 +223,9 @@ JS_SetInterrupt(JSRuntime *rt, JSInterruptHook hook, void *closure)
 {
     rt->debugHooks.interruptHook = hook;
     rt->debugHooks.interruptHookData = closure;
-    return JS_TRUE;
+    for (InterpreterFrames *f = rt->interpreterFrames; f; f = f->older)
+        f->enableInterruptsUnconditionally();
+    return true;
 }
 
 JS_PUBLIC_API(JSBool)
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index db5ad82e1ea..3005261200e 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -923,7 +923,7 @@ template<typename T>
 class GenericInterruptEnabler : public InterpreterFrames::InterruptEnablerBase {
   public:
     GenericInterruptEnabler(T *variable, T value) : variable(variable), value(value) { }
-    void enableInterrupts() const { *variable = value; }
+    void enable() const { *variable = value; }
 
   private:
     T *variable;
@@ -1088,7 +1088,7 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
     register void * const *jumpTable = normalJumpTable;
 
     typedef GenericInterruptEnabler<void * const *> InterruptEnabler;
-    InterruptEnabler interruptEnabler(&jumpTable, interruptJumpTable);
+    InterruptEnabler interrupts(&jumpTable, interruptJumpTable);
 
 # define DO_OP()            JS_BEGIN_MACRO                                    \
                                 CHECK_PCCOUNT_INTERRUPTS();                   \
@@ -1116,7 +1116,7 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
     register int switchMask = 0;
     int switchOp;
     typedef GenericInterruptEnabler<int> InterruptEnabler;
-    InterruptEnabler interruptEnabler(&switchMask, -1);
+    InterruptEnabler interrupts(&switchMask, -1);
 
 # define DO_OP()            goto do_op
 # define DO_NEXT_OP(n)      JS_BEGIN_MACRO                                    \
@@ -1151,8 +1151,6 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
 
 #endif /* !JS_THREADED_INTERP */
 
-#define ENABLE_INTERRUPTS() (interruptEnabler.enableInterrupts())
-
 #define LOAD_DOUBLE(PCOFF, dbl)                                               \
     (dbl = script->getConst(GET_UINT32_INDEX(regs.pc + (PCOFF))).toDouble())
 
@@ -1214,20 +1212,12 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
 #define SET_SCRIPT(s)                                                         \
     JS_BEGIN_MACRO                                                            \
         script = (s);                                                         \
-        if (script->hasAnyBreakpointsOrStepMode())                            \
-            ENABLE_INTERRUPTS();                                              \
-        if (script->hasScriptCounts)                                          \
-            ENABLE_INTERRUPTS();                                              \
+        if (script->hasAnyBreakpointsOrStepMode() || script->hasScriptCounts) \
+            interrupts.enable();                                              \
         JS_ASSERT_IF(interpMode == JSINTERP_SKIP_TRAP,                        \
                      script->hasAnyBreakpointsOrStepMode());                  \
     JS_END_MACRO
 
-#define CHECK_INTERRUPT_HANDLER()                                             \
-    JS_BEGIN_MACRO                                                            \
-        if (cx->runtime->debugHooks.interruptHook)                            \
-            ENABLE_INTERRUPTS();                                              \
-    JS_END_MACRO
-
     /* Repoint cx->regs to a local variable for faster access. */
     FrameRegs regs = cx->regs();
     PreserveRegsGuard interpGuard(cx, regs);
@@ -1236,13 +1226,12 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
      * Help Debugger find frames running scripts that it has put in
      * single-step mode.
      */
-    InterpreterFrames interpreterFrame(cx, &regs, interruptEnabler);
+    InterpreterFrames interpreterFrame(cx, &regs, interrupts);
 
     /* Copy in hot values that change infrequently. */
     JSRuntime *const rt = cx->runtime;
     Rooted<JSScript*> script(cx);
     SET_SCRIPT(regs.fp()->script());
-    CHECK_INTERRUPT_HANDLER();
 
     /*
      * Pool of rooters for use in this interpreter frame. References to these
@@ -1260,9 +1249,6 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
     RootedId rootId0(cx);
     RootedShape rootShape0(cx);
 
-    if (rt->profilingScripts)
-        ENABLE_INTERRUPTS();
-
     if (!entryFrame)
         entryFrame = regs.fp();
 
@@ -1315,8 +1301,6 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
     if (interpMode == JSINTERP_REJOIN)
         interpMode = JSINTERP_NORMAL;
 
-    CHECK_INTERRUPT_HANDLER();
-
     RESET_USE_METHODJIT();
 
     /*
@@ -1329,6 +1313,9 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
     int32_t len;
     len = 0;
 
+    if (rt->profilingScripts || cx->runtime->debugHooks.interruptHook)
+        interrupts.enable();
+
     DO_NEXT_OP(len);
 
 #if JS_THREADED_INTERP
@@ -1424,7 +1411,6 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
                 break;
             }
             JS_ASSERT(status == JSTRAP_CONTINUE);
-            CHECK_INTERRUPT_HANDLER();
             JS_ASSERT(rval.isInt32() && rval.toInt32() == op);
         }
 
@@ -1738,7 +1724,6 @@ BEGIN_CASE(JSOP_ITER)
     uint8_t flags = GET_UINT8(regs.pc);
     if (!ValueToIterator(cx, flags, &regs.sp[-1]))
         goto error;
-    CHECK_INTERRUPT_HANDLER();
     JS_ASSERT(!regs.sp[-1].isPrimitive());
 }
 END_CASE(JSOP_ITER)
@@ -1751,7 +1736,6 @@ BEGIN_CASE(JSOP_MOREITER)
     bool cond;
     if (!IteratorMore(cx, &regs.sp[-2].toObject(), &cond, &regs.sp[-1]))
         goto error;
-    CHECK_INTERRUPT_HANDLER();
     regs.sp[-1].setBoolean(cond);
 }
 END_CASE(JSOP_MOREITER)
@@ -2412,7 +2396,6 @@ BEGIN_CASE(JSOP_EVAL)
         if (!InvokeKernel(cx, args))
             goto error;
     }
-    CHECK_INTERRUPT_HANDLER();
     regs.sp = args.spAfterCall();
     TypeScript::Monitor(cx, script, regs.pc, regs.sp[-1]);
 }
@@ -2445,7 +2428,6 @@ BEGIN_CASE(JSOP_FUNCALL)
         Value *newsp = args.spAfterCall();
         TypeScript::Monitor(cx, script, regs.pc, newsp[-1]);
         regs.sp = newsp;
-        CHECK_INTERRUPT_HANDLER();
         len = JSOP_CALL_LENGTH;
         DO_NEXT_OP(len);
     }
@@ -2483,7 +2465,6 @@ BEGIN_CASE(JSOP_FUNCALL)
             mjit::JaegerStatus status = mjit::JaegerShot(cx, true);
             CHECK_PARTIAL_METHODJIT(status);
             interpReturnOK = mjit::JaegerStatusToSuccess(status);
-            CHECK_INTERRUPT_HANDLER();
             goto jit_return;
         }
     }
@@ -2506,8 +2487,6 @@ BEGIN_CASE(JSOP_FUNCALL)
         }
     }
 
-    CHECK_INTERRUPT_HANDLER();
-
     /* Load first op and dispatch it (safe since JSOP_STOP). */
     op = (JSOp) *regs.pc;
     DO_OP();
@@ -3079,8 +3058,6 @@ BEGIN_CASE(JSOP_NEWINIT)
 
     PUSH_OBJECT(*obj);
     TypeScript::Monitor(cx, script, regs.pc, regs.sp[-1]);
-
-    CHECK_INTERRUPT_HANDLER();
 }
 END_CASE(JSOP_NEWINIT)
 
@@ -3094,8 +3071,6 @@ BEGIN_CASE(JSOP_NEWARRAY)
 
     PUSH_OBJECT(*obj);
     TypeScript::Monitor(cx, script, regs.pc, regs.sp[-1]);
-
-    CHECK_INTERRUPT_HANDLER();
 }
 END_CASE(JSOP_NEWARRAY)
 
@@ -3111,8 +3086,6 @@ BEGIN_CASE(JSOP_NEWOBJECT)
 
     PUSH_OBJECT(*obj);
     TypeScript::Monitor(cx, script, regs.pc, regs.sp[-1]);
-
-    CHECK_INTERRUPT_HANDLER();
 }
 END_CASE(JSOP_NEWOBJECT)
 
@@ -3326,7 +3299,6 @@ BEGIN_CASE(JSOP_DEBUGGER)
         goto error;
       default:;
     }
-    CHECK_INTERRUPT_HANDLER();
 }
 END_CASE(JSOP_DEBUGGER)
 
@@ -3843,7 +3815,6 @@ END_CASE(JSOP_ARRAYPUSH)
               case JSTRAP_CONTINUE:
               default:;
             }
-            CHECK_INTERRUPT_HANDLER();
         }
 
         for (TryNoteIter tni(regs); !tni.done(); ++tni) {
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 0d23ba45571..4eb0b8c19dc 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -234,7 +234,7 @@ class InterpreterFrames {
   public:
     class InterruptEnablerBase {
       public:
-        virtual void enableInterrupts() const = 0;
+        virtual void enable() const = 0;
     };
 
     InterpreterFrames(JSContext *cx, FrameRegs *regs, const InterruptEnablerBase &enabler);
@@ -242,6 +242,7 @@ class InterpreterFrames {
 
     /* If this js::Interpret frame is running |script|, enable interrupts. */
     inline void enableInterruptsIfRunning(JSScript *script);
+    inline void enableInterruptsUnconditionally() { enabler.enable(); }
 
     InterpreterFrames *older;
 
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index b6e81d25702..8d895b4eca1 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -464,7 +464,7 @@ inline void
 InterpreterFrames::enableInterruptsIfRunning(JSScript *script)
 {
     if (script == regs->fp()->script())
-        enabler.enableInterrupts();
+        enabler.enable();
 }
 
 static JS_ALWAYS_INLINE bool

From 523e3e6bc0549ba74d28024015a4aa176152b210 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Wed, 18 Jul 2012 11:03:14 +0100
Subject: [PATCH 005/118] Bug 774306 - Protect access to mFavicons behind a
 getter (r=margaret)

---
 mobile/android/base/AboutHomeContent.java |  2 +-
 mobile/android/base/BrowserApp.java       |  4 ++--
 mobile/android/base/GeckoApp.java         | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mobile/android/base/AboutHomeContent.java b/mobile/android/base/AboutHomeContent.java
index 9d2cea1d74b..e22751a6de4 100644
--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -470,7 +470,7 @@ public class AboutHomeContent extends ScrollView
                             }
                         });
 
-                        Favicons favicons = GeckoApp.mAppContext.mFavicons;
+                        Favicons favicons = GeckoApp.mAppContext.getFavicons();
                         favicons.loadFavicon(pageUrl, iconUrl,
                                     new Favicons.OnFaviconLoadedListener() {
                             public void onFaviconLoaded(String url, Drawable favicon) {
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index e3e18fc3259..f136b0fd74e 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -419,7 +419,7 @@ abstract public class BrowserApp extends GeckoApp
     private void loadFavicon(final Tab tab) {
         maybeCancelFaviconLoad(tab);
 
-        long id = mFavicons.loadFavicon(tab.getURL(), tab.getFaviconURL(),
+        long id = getFavicons().loadFavicon(tab.getURL(), tab.getFaviconURL(),
                         new Favicons.OnFaviconLoadedListener() {
 
             public void onFaviconLoaded(String pageUrl, Drawable favicon) {
@@ -457,7 +457,7 @@ abstract public class BrowserApp extends GeckoApp
             return;
 
         // Cancel pending favicon load task
-        mFavicons.cancelFaviconLoad(faviconLoadId);
+        getFavicons().cancelFaviconLoad(faviconLoadId);
 
         // Reset favicon load state
         tab.setFaviconLoadId(Favicons.NOT_LOADING);
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 65568d35809..785821f4d61 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -96,11 +96,11 @@ abstract public class GeckoApp
     private GeckoConnectivityReceiver mConnectivityReceiver;
     private GeckoBatteryManager mBatteryReceiver;
     private PromptService mPromptService;
+    private Favicons mFavicons;
 
     public DoorHangerPopup mDoorHangerPopup;
     public FormAssistPopup mFormAssistPopup;
     public TabsPanel mTabsPanel;
-    public Favicons mFavicons;
 
     private LayerController mLayerController;
     private GeckoLayerClient mLayerClient;
@@ -391,6 +391,13 @@ abstract public class GeckoApp
         return null;
     }
 
+    synchronized Favicons getFavicons() {
+        if (mFavicons == null)
+            mFavicons = new Favicons(this);
+
+        return mFavicons;
+    }
+
     Class<?> getPluginClass(String packageName, String className)
             throws NameNotFoundException, ClassNotFoundException {
         Context pluginContext = mAppContext.createPackageContext(packageName,
@@ -879,7 +886,7 @@ abstract public class GeckoApp
 
     void handleClearHistory() {
         BrowserDB.clearHistory(getContentResolver());
-        mFavicons.clearFavicons();
+        getFavicons().clearFavicons();
     }
 
     public StartupMode getStartupMode() {
@@ -1885,8 +1892,6 @@ abstract public class GeckoApp
             Log.i(LOGTAG, "Intent : ACTION_DEBUG - waiting 5s before launching");
         }
 
-        mFavicons = new Favicons(this);
-
         Tabs.getInstance().setContentResolver(getContentResolver());
         Tabs.registerOnTabsChangedListener(this);
 

From 0586e200e717be146a13bfb2445a823f08598261 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 18 Jul 2012 13:51:28 +0200
Subject: [PATCH 006/118] Bug 774245 - Factor out single-level checked
 unwrapping into a helper function. r=mrbkap

---
 js/src/jswrapper.cpp | 35 ++++++++++++++++++++++++++---------
 js/src/jswrapper.h   |  5 +++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 66697583942..8c889dfb3f7 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -97,17 +97,34 @@ js::UnwrapObject(JSObject *wrapped, bool stopAtOuter, unsigned *flagsp)
 JS_FRIEND_API(JSObject *)
 js::UnwrapObjectChecked(JSContext *cx, JSObject *obj)
 {
-    while (obj->isWrapper() &&
-           !JS_UNLIKELY(!!obj->getClass()->ext.innerObject)) {
+    while (true) {
         JSObject *wrapper = obj;
-        Wrapper *handler = Wrapper::wrapperHandler(obj);
-        bool rvOnFailure;
-        if (!handler->enter(cx, wrapper, JSID_VOID,
-                            Wrapper::PUNCTURE, &rvOnFailure))
-            return rvOnFailure ? obj : NULL;
-        obj = Wrapper::wrappedObject(obj);
-        JS_ASSERT(obj);
+        obj = UnwrapOneChecked(cx, obj);
+        if (!obj || obj == wrapper)
+            return obj;
     }
+}
+
+JS_FRIEND_API(JSObject *)
+js::UnwrapOneChecked(JSContext *cx, JSObject *obj)
+{
+    // Checked unwraps should never unwrap outer windows.
+    if (!obj->isWrapper() ||
+        JS_UNLIKELY(!!obj->getClass()->ext.innerObject))
+    {
+        return obj;
+    }
+
+    Wrapper *handler = Wrapper::wrapperHandler(obj);
+    bool rvOnFailure;
+    if (!handler->enter(cx, obj, JSID_VOID,
+                        Wrapper::PUNCTURE, &rvOnFailure))
+    {
+        return rvOnFailure ? obj : NULL;
+    }
+    obj = Wrapper::wrappedObject(obj);
+    JS_ASSERT(obj);
+
     return obj;
 }
 
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index a807d6535e2..bec2bbc723e 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -325,6 +325,11 @@ UnwrapObject(JSObject *obj, bool stopAtOuter = true, unsigned *flagsp = NULL);
 JS_FRIEND_API(JSObject *)
 UnwrapObjectChecked(JSContext *cx, JSObject *obj);
 
+// Unwrap only the outermost security wrapper, with the same semantics as
+// above. This is the checked version of Wrapper::wrappedObject.
+JS_FRIEND_API(JSObject *)
+UnwrapOneChecked(JSContext *cx, JSObject *obj);
+
 JS_FRIEND_API(bool)
 IsCrossCompartmentWrapper(const JSObject *obj);
 

From 217bf3edb090e4dba7c7834f24410b19eaec24d5 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 18 Jul 2012 13:51:28 +0200
Subject: [PATCH 007/118] Bug 774245 - Add WrapperFactory and XrayWrapper
 machinery to allow same-compartment Xray wrapping. r=mrbkap

---
 js/xpconnect/wrappers/WrapperFactory.cpp | 36 ++++++++++++++++++++++++
 js/xpconnect/wrappers/WrapperFactory.h   |  3 ++
 js/xpconnect/wrappers/XrayWrapper.cpp    | 17 +++++++++++
 3 files changed, 56 insertions(+)

diff --git a/js/xpconnect/wrappers/WrapperFactory.cpp b/js/xpconnect/wrappers/WrapperFactory.cpp
index b5a925944da..bcc7dd867cf 100644
--- a/js/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/xpconnect/wrappers/WrapperFactory.cpp
@@ -540,4 +540,40 @@ WrapperFactory::WrapComponentsObject(JSContext *cx, JSObject *obj)
     return wrapperObj;
 }
 
+JSObject *
+WrapperFactory::WrapForSameCompartmentXray(JSContext *cx, JSObject *obj)
+{
+    // We should be same-compartment here.
+    MOZ_ASSERT(js::IsObjectInContextCompartment(obj, cx));
+
+    // Sort out what kind of Xray we can do. If we can't Xray, bail.
+    XrayType type = GetXrayType(obj);
+    if (type == NotXray)
+        return NULL;
+
+    // Select the appropriate proxy handler.
+    Wrapper *wrapper = NULL;
+    if (type == XrayForWrappedNative)
+        wrapper = &XrayWrapper<DirectWrapper>::singleton;
+    else if (type == XrayForDOMProxyObject)
+        wrapper = &XrayWrapper<DirectWrapper, ProxyXrayTraits>::singleton;
+    else if (type == XrayForDOMObject)
+        wrapper = &XrayWrapper<DirectWrapper, DOMXrayTraits>::singleton;
+    else
+        MOZ_NOT_REACHED("Bad Xray type");
+
+    // Make the Xray.
+    JSObject *parent = JS_GetGlobalForObject(cx, obj);
+    JSObject *wrapperObj = Wrapper::New(cx, obj, NULL, parent, wrapper);
+    if (!wrapperObj)
+        return NULL;
+
+    // Make the holder.
+    JSObject *xrayHolder = XrayUtils::createHolder(cx, obj, parent);
+    if (!xrayHolder)
+        return nsnull;
+    js::SetProxyExtra(wrapperObj, 0, js::ObjectValue(*xrayHolder));
+    return wrapperObj;
+}
+
 }
diff --git a/js/xpconnect/wrappers/WrapperFactory.h b/js/xpconnect/wrappers/WrapperFactory.h
index b58d67dab6f..185a7dfb0ce 100644
--- a/js/xpconnect/wrappers/WrapperFactory.h
+++ b/js/xpconnect/wrappers/WrapperFactory.h
@@ -88,6 +88,9 @@ class WrapperFactory {
 
     // Wrap a (same compartment) Components object.
     static JSObject *WrapComponentsObject(JSContext *cx, JSObject *obj);
+
+    // Wrap a same-compartment object for Xray inspection.
+    static JSObject *WrapForSameCompartmentXray(JSContext *cx, JSObject *obj);
 };
 
 extern js::DirectWrapper XrayWaiver;
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 8a215b0ed4f..af51a2ee394 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1618,4 +1618,21 @@ template <> XRAY XRAY::singleton(0);
 template class XRAY;
 #undef XRAY
 
+/* Same-compartment non-filtering versions. */
+
+#define XRAY XrayWrapper<DirectWrapper, XPCWrappedNativeXrayTraits >
+template <> XRAY XRAY::singleton(0);
+template class XRAY;
+#undef XRAY
+
+#define XRAY XrayWrapper<DirectWrapper, ProxyXrayTraits >
+template <> XRAY XRAY::singleton(0);
+template class XRAY;
+#undef XRAY
+
+#define XRAY XrayWrapper<DirectWrapper, DOMXrayTraits >
+template <> XRAY XRAY::singleton(0);
+template class XRAY;
+#undef XRAY
+
 }

From 447940c90686970c42910f3d2dfa2105fc75652a Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 18 Jul 2012 13:51:28 +0200
Subject: [PATCH 008/118] Bug 774245 - Re-implement moz_bug_r_a4 trickery.
 r=mrbkap In the next patch, we drop support for lookupMethod for location
 objects, since the security policy there is tricky and location objects are
 already unshadowable Xray wrappers.

---
 browser/components/sessionstore/test/browser_461743_sample.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/sessionstore/test/browser_461743_sample.html b/browser/components/sessionstore/test/browser_461743_sample.html
index e2d41634e68..12294f77c28 100644
--- a/browser/components/sessionstore/test/browser_461743_sample.html
+++ b/browser/components/sessionstore/test/browser_461743_sample.html
@@ -25,7 +25,7 @@
       return flip++ == 0 ? chromeUrl : exploitUrl;
     };
 
-    var href = Components.lookupMethod(frames[1].location, "href");
+    var href = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(frames[1].location), "href").get;
     var loadChrome = { handleEvent: href };
     var loadExploit = { handleEvent: href };
 

From 0a7b5241fb3b440730ffda22f4631e9282632d8d Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 18 Jul 2012 13:51:28 +0200
Subject: [PATCH 009/118] Bug 774245 - Reimplement LookupMethod. r=mrbkap

---
 js/xpconnect/src/XPCComponents.cpp | 96 ++++++++++++++----------------
 1 file changed, 44 insertions(+), 52 deletions(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index cd0a93dfbb7..1995fd8c885 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2697,71 +2697,63 @@ nsXPCComponents_Utils::LookupMethod(const JS::Value& object,
     JSAutoRequest ar(cx);
 
     // first param must be a JSObject
-    if (JSVAL_IS_PRIMITIVE(object))
+    if (!object.isObject())
         return NS_ERROR_XPC_BAD_CONVERT_JS;
+    JSObject *obj = &object.toObject();
 
-    JSObject* obj = JSVAL_TO_OBJECT(object);
-    while (obj && !js::IsWrapper(obj) && !IS_WRAPPER_CLASS(js::GetObjectClass(obj)))
-        obj = JS_GetPrototype(obj);
-
-    if (!obj)
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
-
-    JSObject* unwrappedObject;
-    nsresult rv = nsXPConnect::GetXPConnect()->GetJSObjectOfWrapper(cx, obj, &unwrappedObject);
-    if (NS_FAILED(rv))
-        return rv;
-
-    unwrappedObject = JS_ObjectToInnerObject(cx, unwrappedObject);
-    if (!unwrappedObject)
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
-
-    // second param must be a string
+    // second param must be a string.
     if (!JSVAL_IS_STRING(name))
         return NS_ERROR_XPC_BAD_CONVERT_JS;
+    JSString *methodName = name.toString();
+    jsid methodId = INTERNED_STRING_TO_JSID(cx, JS_InternJSString(cx, methodName));
 
-    // Make sure the name that we use for looking up the method/property is
-    // atomized.
-    jsid name_id;
-    JS::Value dummy;
-    if (!JS_ValueToId(cx, name, &name_id) ||
-        !JS_IdToValue(cx, name_id, &dummy))
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
+    // If |obj| is a cross-compartment wrapper, try to puncture it. If this fails,
+    // we don't have full access to the other compartment, in which case we throw.
+    // Otherwise, enter the compartment.
+    if (js::IsCrossCompartmentWrapper(obj)) {
+        obj = js::UnwrapOneChecked(cx, obj);
+        if (!obj)
+            return NS_ERROR_XPC_BAD_CONVERT_JS;
+    }
 
-    // this will do verification and the method lookup for us
-    // Note that if |obj| is an XPCNativeWrapper this will all still work.
-    // We'll hand back the same method that we'd hand back for the underlying
-    // XPCWrappedNative.  This means no deep wrapping, unfortunately, but we
-    // can't keep track of both the underlying function and the
-    // XPCNativeWrapper at once in a single parent slot...
-    XPCCallContext inner_cc(JS_CALLER, cx, unwrappedObject, nsnull, name_id);
+    {
+        // Enter the target compartment.
+        JSAutoEnterCompartment ac;
+        if (!ac.enter(cx, obj))
+            return NS_ERROR_FAILURE;
 
-    // was our jsobject really a wrapped native at all?
-    XPCWrappedNative* wrapper = inner_cc.GetWrapper();
-    if (!wrapper || !wrapper->IsValid())
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
+        // Now, try to create an Xray wrapper around the object. This won't work
+        // if the object isn't Xray-able. In that case, we throw.
+        JSObject *xray = WrapperFactory::WrapForSameCompartmentXray(cx, obj);
+        if (!xray)
+            return NS_ERROR_XPC_BAD_CONVERT_JS;
 
-    // did we find a method/attribute by that name?
-    XPCNativeMember* member = inner_cc.GetMember();
-    if (!member || member->IsConstant())
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
+        // Alright, now do the lookup.
+        *retval = JSVAL_VOID;
+        JSPropertyDescriptor desc;
+        memset(&desc, 0, sizeof(desc)); // This will be fixed soon in JSAPI.
+        if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, &desc))
+            return NS_ERROR_FAILURE;
 
-    // it would a be a big surprise if there is a member without an interface :)
-    XPCNativeInterface* iface = inner_cc.GetInterface();
-    if (!iface)
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
+        // First look for a method value. If that's not there, try a getter,
+        // since historically lookupMethod also works for getters.
+        JSObject *methodObj = desc.value.isObject() ? &desc.value.toObject() : NULL;
+        if (!methodObj && (desc.attrs & JSPROP_GETTER))
+            methodObj = JS_FUNC_TO_DATA_PTR(JSObject *, desc.getter);
 
-    jsval funval;
+        // Callers of this function seem to expect bound methods. Make it happen.
+        // Note that this is unnecessary until bug 658909 is fixed.
+        if (methodObj && JS_ObjectIsCallable(cx, methodObj))
+            methodObj = JS_BindCallable(cx, methodObj, obj);
 
-    // get (and perhaps lazily create) the member's cloned function
-    if (!member->NewFunctionObject(inner_cc, iface, obj, &funval))
-        return NS_ERROR_XPC_BAD_CONVERT_JS;
+        // Set the return value if appropriate.
+        *retval = methodObj ? ObjectValue(*methodObj) : JSVAL_VOID;
+    }
 
-    NS_ASSERTION(JS_ValueToFunction(inner_cc, funval),
-                 "Function is not a function");
+    // Now that we've left the target compartment, wrap for the caller.
+    if (!JS_WrapValue(cx, retval))
+        return NS_ERROR_FAILURE;;
 
-    // Stick the function in the return value. This roots it.
-    *retval = funval;
     return NS_OK;
 }
 

From b4fc3bcfe884e96cdc0d3b8750fe19a1170d22ad Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 18 Jul 2012 13:51:28 +0200
Subject: [PATCH 010/118] Bug 774245 - Tests. r=mrbkap

---
 js/xpconnect/tests/mochitest/Makefile.in      |  1 +
 .../tests/mochitest/test_lookupMethod.html    | 79 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 js/xpconnect/tests/mochitest/test_lookupMethod.html

diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index 5d17dc3a17c..9ba7cca2c75 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -71,6 +71,7 @@ MOCHITEST_FILES =	bug500931_helper.html \
 		file_bug760131.html \
 		file_empty.html \
 		file_documentdomain.html \
+		test_lookupMethod.html \
 		$(NULL)
 
 MOCHITEST_CHROME_FILES	= \
diff --git a/js/xpconnect/tests/mochitest/test_lookupMethod.html b/js/xpconnect/tests/mochitest/test_lookupMethod.html
new file mode 100644
index 00000000000..8a971b7655e
--- /dev/null
+++ b/js/xpconnect/tests/mochitest/test_lookupMethod.html
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=774245
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 774245</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=774245">Mozilla Bug 774245</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Components.lookupMethod in content scope. **/
+SimpleTest.waitForExplicitFinish();
+
+var gLoaded = 0;
+function loaded() {
+  if (++gLoaded == 2)
+    go();
+}
+
+var sameOriginWin;
+var crossOriginWin;
+function go() {
+  // Grab references to the content windows.
+  sameOriginWin = document.getElementById('ifr-same').contentWindow;
+  crossOriginWin = document.getElementById('ifr-cross').contentWindow;
+
+  // Test same-compartment.
+  document.getElementsByTagName = function() { ok(false, "dont call me"); };
+  var result = Components.lookupMethod(document, 'getElementsByTagName')('iframe');
+  is(result.length, 2, "same-origin lookupMethod works");
+
+  // Test that the method is bound.
+  var gebtn = Components.lookupMethod(document, 'getElementsByTagName');
+  is(Function.call.apply(gebtn, [window, 'iframe']).length, 2, "method is bound");
+
+  // Test that we throw for location objects. Location objects already use same-
+  // compartment Xrays, so callers shouldn't need to use lookupMethod there. And
+  // making it work would involve complicating the security surounding the
+  // implementation.
+  try {
+    Components.lookupMethod(location, 'href');
+    ok(false, "Didn't throw when we should have!");
+  } catch(e) {
+    ok(true, "Correctly threw when trying to lookupMethod on location object");
+  }
+
+  // Test cross-compartment same-origin.
+  sameOriginWin.setTimeout = function() { ok(false, "dont call me either"); };
+  Components.lookupMethod(sameOriginWin, 'setTimeout')(continueTest, 0);
+}
+
+function continueTest() {
+  // Test that cross-origin fails.
+  try {
+    Components.lookupMethod(crossOriginWin, 'top');
+    ok(false, "Should have thrown");
+  } catch (e) {
+    ok(true, "Threw appropriately");
+  }
+
+  SimpleTest.finish();
+}
+
+
+</script>
+</pre>
+<iframe id="ifr-same" onload="loaded();" src="file_empty.html"></iframe>
+<iframe id="ifr-cross" onload="loaded();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_empty.html"></iframe>
+</body>
+</html>

From b12fe945702e3a479f9b465abcaa22df60591222 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Wed, 18 Jul 2012 06:35:00 -0600
Subject: [PATCH 011/118] Use distinct types and scripts for generic inner
 wrapper functions, bug 638794. r=jandem

---
 js/src/jsfun.cpp        | 19 ++++++++-----
 js/src/jsinfer.cpp      | 15 ++++++++---
 js/src/jsinferinlines.h | 60 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 048063435c9..2b5fe5a14ed 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1268,7 +1268,7 @@ js_CloneFunctionObject(JSContext *cx, HandleFunction fun, HandleObject parent,
         clone->initializeExtended();
     }
 
-    if (cx->compartment == fun->compartment()) {
+    if (cx->compartment == fun->compartment() && !types::UseNewTypeForClone(fun)) {
         /*
          * We can use the same type as the original function provided that (a)
          * its prototype is correct, and (b) its type is not a singleton. The
@@ -1279,6 +1279,9 @@ js_CloneFunctionObject(JSContext *cx, HandleFunction fun, HandleObject parent,
         if (fun->getProto() == proto && !fun->hasSingletonType())
             clone->setType(fun->type());
     } else {
+        if (!clone->setSingletonType(cx))
+            return NULL;
+
         /*
          * Across compartments we have to clone the script for interpreted
          * functions. Cross-compartment cloning only happens via JSAPI
@@ -1289,22 +1292,24 @@ js_CloneFunctionObject(JSContext *cx, HandleFunction fun, HandleObject parent,
             RootedScript script(cx, clone->script());
             JS_ASSERT(script);
             JS_ASSERT(script->compartment() == fun->compartment());
-            JS_ASSERT(script->compartment() != cx->compartment);
-            JS_ASSERT(!script->enclosingStaticScope());
+            JS_ASSERT_IF(script->compartment() != cx->compartment,
+                         !script->enclosingStaticScope() && !script->compileAndGo);
+
+            RootedObject scope(cx, script->enclosingStaticScope());
 
             clone->mutableScript().init(NULL);
 
-            JSScript *cscript = CloneScript(cx, NullPtr(), clone, script);
+            JSScript *cscript = CloneScript(cx, scope, clone, script);
             if (!cscript)
                 return NULL;
 
             clone->setScript(cscript);
             cscript->setFunction(clone);
-            if (!clone->setTypeForScriptedFunction(cx))
-                return NULL;
+
+            GlobalObject *global = script->compileAndGo ? &script->global() : NULL;
 
             js_CallNewScriptHook(cx, clone->script(), clone);
-            Debugger::onNewScript(cx, clone->script(), NULL);
+            Debugger::onNewScript(cx, clone->script(), global);
         }
     }
     return clone;
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index b587ccb3576..ce3f221df96 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -3629,7 +3629,7 @@ ScriptAnalysis::analyzeTypesBytecode(JSContext *cx, unsigned offset,
             res = &pushed[0];
 
         if (res) {
-            if (script->hasGlobal())
+            if (script->hasGlobal() && !UseNewTypeForClone(obj->toFunction()))
                 res->addType(cx, Type::ObjectType(obj));
             else
                 res->addType(cx, Type::UnknownType());
@@ -3926,12 +3926,14 @@ ScriptAnalysis::analyzeTypesBytecode(JSContext *cx, unsigned offset,
         pushed[0].addType(cx, Type::UnknownType());
         break;
 
-      case JSOP_CALLEE:
-        if (script->hasGlobal())
-            pushed[0].addType(cx, Type::ObjectType(script->function()));
+      case JSOP_CALLEE: {
+        JSFunction *fun = script->function();
+        if (script->hasGlobal() && !UseNewTypeForClone(fun))
+            pushed[0].addType(cx, Type::ObjectType(fun));
         else
             pushed[0].addType(cx, Type::UnknownType());
         break;
+      }
 
       default:
         /* Display fine-grained debug information first */
@@ -5040,6 +5042,11 @@ JSFunction::setTypeForScriptedFunction(JSContext *cx, bool singleton)
     if (singleton) {
         if (!setSingletonType(cx))
             return false;
+    } else if (UseNewTypeForClone(this)) {
+        /*
+         * Leave the default unknown-properties type for the function, it
+         * should not be used by scripts or appear in type sets.
+         */
     } else {
         RootedFunction self(cx, this);
 
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index 98c1b6ad6e9..b7bbd9293f2 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -489,6 +489,66 @@ UseNewTypeAtEntry(JSContext *cx, StackFrame *fp)
            UseNewType(cx, fp->prev()->script(), fp->prevpc());
 }
 
+inline bool
+UseNewTypeForClone(JSFunction *fun)
+{
+    if (fun->hasSingletonType() || !fun->isInterpreted())
+        return false;
+
+    /*
+     * When a function is being used as a wrapper for another function, it
+     * improves precision greatly to distinguish between different instances of
+     * the wrapper; otherwise we will conflate much of the information about
+     * the wrapped functions.
+     *
+     * An important example is the Class.create function at the core of the
+     * Prototype.js library, which looks like:
+     *
+     * var Class = {
+     *   create: function() {
+     *     return function() {
+     *       this.initialize.apply(this, arguments);
+     *     }
+     *   }
+     * };
+     *
+     * Each instance of the innermost function will have a different wrapped
+     * initialize method. We capture this, along with similar cases, by looking
+     * for short scripts which use both .apply and arguments. For such scripts,
+     * whenever creating a new instance of the function we both give that
+     * instance a singleton type and clone the underlying script.
+     */
+
+    JSScript *script = fun->script();
+
+    if (script->length >= 50)
+        return false;
+
+    if (script->hasConsts() ||
+        script->hasObjects() ||
+        script->hasRegexps() ||
+        script->hasClosedArgs() ||
+        script->hasClosedVars())
+    {
+        return false;
+    }
+
+    bool hasArguments = false;
+    bool hasApply = false;
+
+    for (jsbytecode *pc = script->code;
+         pc != script->code + script->length;
+         pc += GetBytecodeLength(pc))
+    {
+        if (*pc == JSOP_ARGUMENTS)
+            hasArguments = true;
+        if (*pc == JSOP_FUNAPPLY)
+            hasApply = true;
+    }
+
+    return hasArguments && hasApply;
+}
+
 /////////////////////////////////////////////////////////////////////
 // Script interface functions
 /////////////////////////////////////////////////////////////////////

From eca5f07a6fcbc67dd59f38ac875ead21dd948388 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Wed, 18 Jul 2012 06:43:18 -0600
Subject: [PATCH 012/118] Treat known booleans like integers during bitops, bug
 774812. r=jandem

---
 js/src/methodjit/FastOps.cpp  | 27 +++++++++++++++++----------
 js/src/methodjit/FrameEntry.h |  6 ++++--
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/js/src/methodjit/FastOps.cpp b/js/src/methodjit/FastOps.cpp
index 8061745a650..468a5a3f2b0 100644
--- a/js/src/methodjit/FastOps.cpp
+++ b/js/src/methodjit/FastOps.cpp
@@ -28,14 +28,22 @@ using namespace js::mjit;
 
 typedef JSC::MacroAssembler::RegisterID RegisterID;
 
+static inline bool
+SuitableForBitop(FrameEntry *fe)
+{
+    return !(fe->isNotType(JSVAL_TYPE_INT32) &&
+             fe->isNotType(JSVAL_TYPE_DOUBLE) &&
+             fe->isNotType(JSVAL_TYPE_BOOLEAN));
+}
+
 void
 mjit::Compiler::ensureInteger(FrameEntry *fe, Uses uses)
 {
+    JS_ASSERT(SuitableForBitop(fe));
+
     if (fe->isConstant()) {
-        if (!fe->isType(JSVAL_TYPE_INT32)) {
-            JS_ASSERT(fe->isType(JSVAL_TYPE_DOUBLE));
-            fe->convertConstantDoubleToInt32(cx);
-        }
+        if (!fe->isType(JSVAL_TYPE_INT32))
+            fe->convertConstantDoubleOrBooleanToInt32(cx);
     } else if (fe->isType(JSVAL_TYPE_DOUBLE)) {
         FPRegisterID fpreg = frame.tempFPRegForData(fe);
         FPRegisterID fptemp = frame.allocFPReg();
@@ -68,7 +76,7 @@ mjit::Compiler::ensureInteger(FrameEntry *fe, Uses uses)
 
         frame.freeReg(fptemp);
         frame.learnType(fe, JSVAL_TYPE_INT32, data);
-    } else if (!fe->isType(JSVAL_TYPE_INT32)) {
+    } else if (!fe->isType(JSVAL_TYPE_INT32) && !fe->isType(JSVAL_TYPE_BOOLEAN)) {
         if (masm.supportsFloatingPoint()) {
             FPRegisterID fptemp = frame.allocFPReg();
             RegisterID typeReg = frame.tempRegForType(fe);
@@ -114,7 +122,7 @@ mjit::Compiler::jsop_bitnot()
     FrameEntry *top = frame.peek(-1);
 
     /* We only want to handle integers here. */
-    if (top->isNotType(JSVAL_TYPE_INT32) && top->isNotType(JSVAL_TYPE_DOUBLE)) {
+    if (!SuitableForBitop(top)) {
         prepareStubCall(Uses(1));
         INLINE_STUBCALL(stubs::BitNot, REJOIN_FALLTHROUGH);
         frame.pop();
@@ -170,12 +178,11 @@ mjit::Compiler::jsop_bitop(JSOp op)
     }
 
     /* Convert a double RHS to integer if it's constant for the test below. */
-    if (rhs->isConstant() && rhs->getValue().isDouble())
-        rhs->convertConstantDoubleToInt32(cx);
+    if (rhs->isConstant() && (rhs->isType(JSVAL_TYPE_DOUBLE) || rhs->isType(JSVAL_TYPE_BOOLEAN)))
+        rhs->convertConstantDoubleOrBooleanToInt32(cx);
 
     /* We only want to handle integers here. */
-    if ((lhs->isNotType(JSVAL_TYPE_INT32) && lhs->isNotType(JSVAL_TYPE_DOUBLE)) ||
-        (rhs->isNotType(JSVAL_TYPE_INT32) && rhs->isNotType(JSVAL_TYPE_DOUBLE)) ||
+    if (!SuitableForBitop(lhs) || !SuitableForBitop(rhs) ||
         (op == JSOP_URSH && rhs->isConstant() && rhs->getValue().toInt32() % 32 == 0)) {
         prepareStubCall(Uses(2));
         INLINE_STUBCALL(stub, REJOIN_FALLTHROUGH);
diff --git a/js/src/methodjit/FrameEntry.h b/js/src/methodjit/FrameEntry.h
index 289b469777d..7e37eb45859 100644
--- a/js/src/methodjit/FrameEntry.h
+++ b/js/src/methodjit/FrameEntry.h
@@ -56,8 +56,10 @@ class FrameEntry
 #endif
 
     /* For a constant double FrameEntry, truncate to an int32. */
-    void convertConstantDoubleToInt32(JSContext *cx) {
-        JS_ASSERT(isType(JSVAL_TYPE_DOUBLE) && isConstant());
+    void convertConstantDoubleOrBooleanToInt32(JSContext *cx) {
+        JS_ASSERT(isConstant());
+        JS_ASSERT(isType(JSVAL_TYPE_DOUBLE) || isType(JSVAL_TYPE_BOOLEAN));
+
         int32_t value;
         ToInt32(cx, getValue(), &value);
 

From 2d242e094bfbbd1ff8544afdc7d5bc4bc8c78895 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 18 Jul 2012 14:56:54 +0200
Subject: [PATCH 013/118] Bug 774245 - Remove unnecessary memset. r=mccr8

---
 js/xpconnect/src/XPCComponents.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 1995fd8c885..c46b43108e9 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2731,7 +2731,6 @@ nsXPCComponents_Utils::LookupMethod(const JS::Value& object,
         // Alright, now do the lookup.
         *retval = JSVAL_VOID;
         JSPropertyDescriptor desc;
-        memset(&desc, 0, sizeof(desc)); // This will be fixed soon in JSAPI.
         if (!JS_GetPropertyDescriptorById(cx, xray, methodId, 0, &desc))
             return NS_ERROR_FAILURE;
 

From 26d0df616097f73ae8494e16171d1b40c0ce63f6 Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Wed, 18 Jul 2012 05:59:21 -0700
Subject: [PATCH 014/118] Back out 353b4785836a which was landed even after the
 module owner explicitly said not to. r=me

--HG--
extra : rebase_source : ff4a63d2c56435d3aa6b0c572067878cfa09378c
---
 dom/indexedDB/ipc/Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in
index 0c5df4660df..b2769d17c50 100644
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -31,8 +31,7 @@ LOCAL_INCLUDES += \
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
-# Bug 770046 - Cannot fail.
-# MOCHITEST_FILES = test_ipc.html
+MOCHITEST_FILES = test_ipc.html
 
 # Need to enable these tests sometime soon.
 #XPCSHELL_TESTS = unit

From 4f451947255752eb40be58a5d01e279add2ed5be Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 18 Jul 2012 09:15:13 -0400
Subject: [PATCH 015/118] Bug 774133 - Make nsDisplayTransform take account of
 zooming for SVG transforms. r=roc.

---
 layout/base/nsDisplayList.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 5748b59915f..a866caa2851 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -2783,6 +2783,11 @@ nsDisplayTransform::GetResultingTransformMatrix(const nsIFrame* aFrame,
                                                     aFrame->PresContext(),
                                                     dummy, bounds, aAppUnitsPerPixel);
   } else if (hasSVGTransforms) {
+    // Correct the translation components for zoom:
+    float pixelsPerCSSPx = aFrame->PresContext()->AppUnitsPerCSSPixel() /
+                             aAppUnitsPerPixel;
+    svgTransform.x0 *= pixelsPerCSSPx;
+    svgTransform.y0 *= pixelsPerCSSPx;
     result = gfx3DMatrix::From2D(svgTransform);
   } else {
      NS_ASSERTION(aFrame->GetStyleDisplay()->mTransformStyle == NS_STYLE_TRANSFORM_STYLE_PRESERVE_3D ||
@@ -2791,6 +2796,11 @@ nsDisplayTransform::GetResultingTransformMatrix(const nsIFrame* aFrame,
   }
 
   if (hasSVGTransforms && !transformFromSVGParent.IsIdentity()) {
+    // Correct the translation components for zoom:
+    float pixelsPerCSSPx = aFrame->PresContext()->AppUnitsPerCSSPixel() /
+                             aAppUnitsPerPixel;
+    transformFromSVGParent.x0 *= pixelsPerCSSPx;
+    transformFromSVGParent.y0 *= pixelsPerCSSPx;
     result = result * gfx3DMatrix::From2D(transformFromSVGParent);
   }
 

From 2e660128ad1e8fb15ad8e75ef3710cb9b6f44f2a Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Wed, 18 Jul 2012 14:25:20 +0100
Subject: [PATCH 016/118] Bug 774797 - Robocop: upgrade to robotium-3.3.jar;
 r=jmaher

---
 build/mobile/robocop/Makefile.in             |   2 +-
 build/mobile/robocop/README                  |   2 +-
 build/mobile/robocop/robotium-solo-3.2.1.jar | Bin 52121 -> 0 bytes
 build/mobile/robocop/robotium-solo-3.3.jar   | Bin 0 -> 55662 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 build/mobile/robocop/robotium-solo-3.2.1.jar
 create mode 100644 build/mobile/robocop/robotium-solo-3.3.jar

diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index 24e5335139f..fa4ba29398c 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -12,7 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = robocop
 
-ROBOTIUM_PATH = $(srcdir)/robotium-solo-3.2.1.jar
+ROBOTIUM_PATH = $(srcdir)/robotium-solo-3.3.jar
 
 JAVAFILES = \
   R.java \
diff --git a/build/mobile/robocop/README b/build/mobile/robocop/README
index 6d41b069749..6b3f5819907 100644
--- a/build/mobile/robocop/README
+++ b/build/mobile/robocop/README
@@ -4,6 +4,6 @@ Robotium is an open source tool licensed under the Apache 2.0 license and the or
 source can be found here:
 http://code.google.com/p/robotium/
 
-We are including robotium-solo-3.2.1.jar as a binary and are not modifying it in anyway 
+We are including robotium-solo-3.3.jar as a binary and are not modifying it in anyway 
 from the original download found at: 
 http://code.google.com/p/robotium/
diff --git a/build/mobile/robocop/robotium-solo-3.2.1.jar b/build/mobile/robocop/robotium-solo-3.2.1.jar
deleted file mode 100644
index f4107c7496ec18d7a5fc2fe56742036ef3861bb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52121
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

diff --git a/build/mobile/robocop/robotium-solo-3.3.jar b/build/mobile/robocop/robotium-solo-3.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0fd9421101ed0dc10a00a2b85c4b0811abd2bd2a
GIT binary patch
literal 55662
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
QG9SX<cDRwB0kk0e2Y}oFn*aa+

literal 0
HcmV?d00001


From 2e798e22dcf0402c66292048b0c92b7220f13044 Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Wed, 18 Jul 2012 09:49:34 -0400
Subject: [PATCH 017/118] Bug 772682: Make Mac OS X 10.6 the minimum required
 OS version. r=gavin

---
 browser/app/macbuild/Contents/Info.plist.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
index 38b2cc00b39..3fa871a7941 100644
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -204,11 +204,11 @@
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.5</string>
+	<string>10.6</string>
 	<key>LSMinimumSystemVersionByArchitecture</key>
 	<dict>
 		<key>i386</key>
-		<string>10.5.0</string>
+		<string>10.6.0</string>
 		<key>x86_64</key>
 		<string>10.6.0</string>
 	</dict>

From a265b4162a30a83ff4fffd95fa9b5ece5d12a006 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Tue, 17 Jul 2012 22:54:25 +0200
Subject: [PATCH 018/118] Fix for bug 774775 (XRayWrapper does not handle new
 bindings constants). r=bz.

--HG--
extra : rebase_source : fef985d0417c394ae5997b4450c7076005bdf870
---
 dom/bindings/Codegen.py                       | 54 ++++++++++++++++---
 .../chrome/test_sandbox_bindings.xul          |  6 +++
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 85cad595abf..fe9bd07a639 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -769,11 +769,12 @@ class PropertyDefiner:
             return "s" + self.name
         return "NULL"
     def usedForXrays(self, chrome):
-        # We only need Xrays for methods and attributes.  And we only need them
-        # for the non-chrome ones if we have no chromeonly things.  Otherwise
-        # (we have chromeonly attributes) we need Xrays for the chrome
-        # methods/attributes.  Finally, in workers there are no Xrays.
-        return ((self.name is "Methods" or self.name is "Attributes") and
+        # We only need Xrays for methods, attributes and constants.  And we only
+        # need them for the non-chrome ones if we have no chromeonly things.
+        # Otherwise (we have chromeonly attributes) we need Xrays for the chrome
+        # methods/attributes/constants.  Finally, in workers there are no Xrays.
+        return ((self.name is "Methods" or self.name is "Attributes" or
+                 self.name is "Constants") and
                 chrome == self.hasChromeOnly() and
                 not self.descriptor.workers)
 
@@ -1012,7 +1013,7 @@ class PropertyArrays():
 
     @staticmethod
     def xrayRelevantArrayNames():
-        return [ "methods", "attrs" ]
+        return [ "methods", "attrs", "consts" ]
 
     def hasChromeOnly(self):
         return reduce(lambda b, a: b or getattr(self, a).hasChromeOnly(),
@@ -3854,6 +3855,28 @@ class CGResolveProperty(CGAbstractMethod):
     }
   }
 
+""" % varNames
+
+        consts = self.properties.consts
+        if consts.hasNonChromeOnly() or consts.hasChromeOnly():
+            str += """  // %(consts)s has an end-of-list marker at the end that we ignore
+  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(consts)s)-1; ++prefIdx) {
+    MOZ_ASSERT(%(consts)s[prefIdx].specs);
+    if (%(consts)s[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = %(consts)s[prefIdx].specs - %(consts)s_specs;;
+      for ( ; %(consts)s_ids[i] != JSID_VOID; ++i) {
+        if (id == %(consts)s_ids[i]) {
+          desc->attrs = JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT;
+          desc->obj = wrapper;
+          desc->value = %(consts)s_specs[i].value;
+          return true;
+        }
+      }
+    }
+  }
+
 """ % varNames
 
         return str + "  return true;"
@@ -3906,6 +3929,25 @@ class CGEnumerateProperties(CGAbstractMethod):
     }
   }
 
+""" % varNames
+
+        consts = self.properties.consts
+        if consts.hasNonChromeOnly() or consts.hasChromeOnly():
+            str += """  // %(consts)s has an end-of-list marker at the end that we ignore
+  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(consts)s)-1; ++prefIdx) {
+    MOZ_ASSERT(%(consts)s[prefIdx].specs);
+    if (%(consts)s[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = %(consts)s[prefIdx].specs - %(consts)s_specs;;
+      for ( ; %(consts)s_ids[i] != JSID_VOID; ++i) {
+        if (!props.append(%(consts)s_ids[i])) {
+          return false;
+        }
+      }
+    }
+  }
+
 """ % varNames
 
         return str + "  return true;"
diff --git a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
index a618e0cd1c9..f4e0439cc40 100644
--- a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
+++ b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
@@ -42,6 +42,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=741267
       } catch (e) {
         ok(false, "'XMLHttpRequest()' shouldn't throw in a sandbox");
       }
+      try {
+        var canvas = Components.utils.evalInSandbox("document.createElement('canvas').getContext('2d')", sandbox);
+        is(canvas.DRAWWINDOW_DRAW_CARET, CanvasRenderingContext2D.DRAWWINDOW_DRAW_CARET, "Constants should be defined on DOM objects in a sandbox");
+      } catch (e) {
+        ok(false, "'document.createElement('canvas').getContext('2D')' shouldn't throw in a sandbox");
+      }
       SimpleTest.finish();
     }
 

From e6c18ed0062462110e1b5437fe5a1dae6e075d88 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Wed, 18 Jul 2012 13:52:07 +0200
Subject: [PATCH 019/118] Fix for bug 774775 (XRayWrapper does not handle new
 bindings constants) - refactor code. r=bz.

--HG--
extra : rebase_source : 317d5942dde4427384320cb334f794f7fef37a2e
---
 dom/bindings/BindingUtils.cpp | 142 ++++++++++++++++++++++++
 dom/bindings/BindingUtils.h   |  33 ++++++
 dom/bindings/Codegen.py       | 197 +++++++++-------------------------
 3 files changed, 225 insertions(+), 147 deletions(-)

diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index be77db2c324..e78416563c2 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -425,5 +425,147 @@ ThrowingConstructorWorkers(JSContext* cx, unsigned argc, JS::Value* vp)
   return Throw<false>(cx, NS_ERROR_FAILURE);
 }
 
+bool
+XrayResolveProperty(JSContext* cx, JSObject* wrapper, jsid id,
+                    JSPropertyDescriptor* desc,
+                    // And the things we need to determine the descriptor
+                    Prefable<JSFunctionSpec>* methods,
+                    jsid* methodIds,
+                    JSFunctionSpec* methodSpecs,
+                    size_t methodCount,
+                    Prefable<JSPropertySpec>* attributes,
+                    jsid* attributeIds,
+                    JSPropertySpec* attributeSpecs,
+                    size_t attributeCount,
+                    Prefable<ConstantSpec>* constants,
+                    jsid* constantIds,
+                    ConstantSpec* constantSpecs,
+                    size_t constantCount)
+{
+  for (size_t prefIdx = 0; prefIdx < methodCount; ++prefIdx) {
+    MOZ_ASSERT(methods[prefIdx].specs);
+    if (methods[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = methods[prefIdx].specs - methodSpecs;
+      for ( ; methodIds[i] != JSID_VOID; ++i) {
+        if (id == methodIds[i]) {
+          JSFunction *fun = JS_NewFunctionById(cx, methodSpecs[i].call,
+                                               methodSpecs[i].nargs, 0,
+                                               wrapper, id);
+          if (!fun)
+              return false;
+          JSObject *funobj = JS_GetFunctionObject(fun);
+          desc->value.setObject(*funobj);
+          desc->attrs = methodSpecs[i].flags;
+          desc->obj = wrapper;
+          desc->setter = nsnull;
+          desc->getter = nsnull;
+          return true;
+        }
+      }
+    }
+  }
+
+  for (size_t prefIdx = 0; prefIdx < attributeCount; ++prefIdx) {
+    MOZ_ASSERT(attributes[prefIdx].specs);
+    if (attributes[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = attributes[prefIdx].specs - attributeSpecs;
+      for ( ; attributeIds[i] != JSID_VOID; ++i) {
+        if (id == attributeIds[i]) {
+          desc->attrs = attributeSpecs[i].flags;
+          desc->obj = wrapper;
+          desc->setter = attributeSpecs[i].setter;
+          desc->getter = attributeSpecs[i].getter;
+          return true;
+        }
+      }
+    }
+  }
+
+  for (size_t prefIdx = 0; prefIdx < constantCount; ++prefIdx) {
+    MOZ_ASSERT(constants[prefIdx].specs);
+    if (constants[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = constants[prefIdx].specs - constantSpecs;
+      for ( ; constantIds[i] != JSID_VOID; ++i) {
+        if (id == constantIds[i]) {
+          desc->attrs = JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT;
+          desc->obj = wrapper;
+          desc->value = constantSpecs[i].value;
+          return true;
+        }
+      }
+    }
+  }
+
+  return true;
+}
+
+bool
+XrayEnumerateProperties(JS::AutoIdVector& props,
+                        Prefable<JSFunctionSpec>* methods,
+                        jsid* methodIds,
+                        JSFunctionSpec* methodSpecs,
+                        size_t methodCount,
+                        Prefable<JSPropertySpec>* attributes,
+                        jsid* attributeIds,
+                        JSPropertySpec* attributeSpecs,
+                        size_t attributeCount,
+                        Prefable<ConstantSpec>* constants,
+                        jsid* constantIds,
+                        ConstantSpec* constantSpecs,
+                        size_t constantCount)
+{
+  for (size_t prefIdx = 0; prefIdx < methodCount; ++prefIdx) {
+    MOZ_ASSERT(methods[prefIdx].specs);
+    if (methods[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = methods[prefIdx].specs - methodSpecs;
+      for ( ; methodIds[i] != JSID_VOID; ++i) {
+        if ((methodSpecs[i].flags & JSPROP_ENUMERATE) &&
+            !props.append(methodIds[i])) {
+          return false;
+        }
+      }
+    }
+  }
+
+  for (size_t prefIdx = 0; prefIdx < attributeCount; ++prefIdx) {
+    MOZ_ASSERT(attributes[prefIdx].specs);
+    if (attributes[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = attributes[prefIdx].specs - attributeSpecs;
+      for ( ; attributeIds[i] != JSID_VOID; ++i) {
+        if ((attributeSpecs[i].flags & JSPROP_ENUMERATE) &&
+            !props.append(attributeIds[i])) {
+          return false;
+        }
+      }
+    }
+  }
+
+  for (size_t prefIdx = 0; prefIdx < constantCount; ++prefIdx) {
+    MOZ_ASSERT(constants[prefIdx].specs);
+    if (constants[prefIdx].enabled) {
+      // Set i to be the index into our full list of ids/specs that we're
+      // looking at now.
+      size_t i = constants[prefIdx].specs - constantSpecs;
+      for ( ; constantIds[i] != JSID_VOID; ++i) {
+        if (!props.append(constantIds[i])) {
+          return false;
+        }
+      }
+    }
+  }
+
+  return true;
+}
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index 7c72a8f157b..61ed5de6afc 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -1008,6 +1008,39 @@ public:
     }
 };
 
+// Implementation of the bits that XrayWrapper needs
+bool
+XrayResolveProperty(JSContext* cx, JSObject* wrapper, jsid id,
+                    JSPropertyDescriptor* desc,
+                    // And the things we need to determine the descriptor
+                    Prefable<JSFunctionSpec>* methods,
+                    jsid* methodIds,
+                    JSFunctionSpec* methodSpecs,
+                    size_t methodCount,
+                    Prefable<JSPropertySpec>* attributes,
+                    jsid* attributeIds,
+                    JSPropertySpec* attributeSpecs,
+                    size_t attributeCount,
+                    Prefable<ConstantSpec>* constants,
+                    jsid* constantIds,
+                    ConstantSpec* constantSpecs,
+                    size_t constantCount);
+
+bool
+XrayEnumerateProperties(JS::AutoIdVector& props,
+                        Prefable<JSFunctionSpec>* methods,
+                        jsid* methodIds,
+                        JSFunctionSpec* methodSpecs,
+                        size_t methodCount,
+                        Prefable<JSPropertySpec>* attributes,
+                        jsid* attributeIds,
+                        JSPropertySpec* attributeSpecs,
+                        size_t attributeCount,
+                        Prefable<ConstantSpec>* constants,
+                        jsid* constantIds,
+                        ConstantSpec* constantSpecs,
+                        size_t constantCount);
+
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index fe9bd07a639..e194e5e9f76 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -3794,163 +3794,66 @@ class CGClass(CGThing):
             result = result + memberString
         return result
 
-class CGResolveProperty(CGAbstractMethod):
+class CGXrayHelper(CGAbstractMethod):
+    def __init__(self, descriptor, name, args, properties):
+        CGAbstractMethod.__init__(self, descriptor, name, "bool", args)
+        self.properties = properties
+
+    def definition_body(self):
+        varNames = self.properties.variableNames(True)
+
+        methods = self.properties.methods
+        if methods.hasNonChromeOnly() or methods.hasChromeOnly():
+            methodArgs = """// %(methods)s has an end-of-list marker at the end that we ignore
+%(methods)s, %(methods)s_ids, %(methods)s_specs, ArrayLength(%(methods)s) - 1""" % varNames
+        else:
+            methodArgs = "NULL, NULL, NULL, 0"
+        methodArgs = CGGeneric(methodArgs)
+
+        attrs = self.properties.attrs
+        if attrs.hasNonChromeOnly() or attrs.hasChromeOnly():
+            attrArgs = """// %(attrs)s has an end-of-list marker at the end that we ignore
+%(attrs)s, %(attrs)s_ids, %(attrs)s_specs, ArrayLength(%(attrs)s) - 1""" % varNames
+        else:
+            attrArgs = "NULL, NULL, NULL, 0"
+        attrArgs = CGGeneric(attrArgs)
+
+        consts = self.properties.consts
+        if consts.hasNonChromeOnly() or consts.hasChromeOnly():
+            constArgs = """// %(consts)s has an end-of-list marker at the end that we ignore
+%(consts)s, %(consts)s_ids, %(consts)s_specs, ArrayLength(%(consts)s) - 1""" % varNames
+        else:
+            constArgs = "NULL, NULL, NULL, 0"
+        constArgs = CGGeneric(constArgs)
+
+        prefixArgs = CGGeneric(self.getPrefixArgs())
+
+        return CGIndenter(
+            CGWrapper(CGList([prefixArgs, methodArgs, attrArgs, constArgs], ",\n"),
+                      pre=("return Xray%s(" % self.name),
+                      post=");",
+                      reindent=True)).define()
+
+class CGResolveProperty(CGXrayHelper):
     def __init__(self, descriptor, properties):
         args = [Argument('JSContext*', 'cx'), Argument('JSObject*', 'wrapper'),
                 Argument('jsid', 'id'), Argument('bool', 'set'),
                 Argument('JSPropertyDescriptor*', 'desc')]
-        CGAbstractMethod.__init__(self, descriptor, "ResolveProperty", "bool", args)
-        self.properties = properties
-    def definition_body(self):
-        str = ""
+        CGXrayHelper.__init__(self, descriptor, "ResolveProperty", args,
+                              properties)
 
-        varNames = self.properties.variableNames(True)
+    def getPrefixArgs(self):
+        return "cx, wrapper, id, desc"
 
-        methods = self.properties.methods
-        if methods.hasNonChromeOnly() or methods.hasChromeOnly():
-            str += """  // %(methods)s has an end-of-list marker at the end that we ignore
-  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(methods)s)-1; ++prefIdx) {
-    MOZ_ASSERT(%(methods)s[prefIdx].specs);
-    if (%(methods)s[prefIdx].enabled) {
-      // Set i to be the index into our full list of ids/specs that we're
-      // looking at now.
-      size_t i = %(methods)s[prefIdx].specs - %(methods)s_specs;
-      for ( ; %(methods)s_ids[i] != JSID_VOID; ++i) {
-        if (id == %(methods)s_ids[i]) {
-          JSFunction *fun = JS_NewFunctionById(cx, %(methods)s_specs[i].call, %(methods)s_specs[i].nargs, 0, wrapper, id);
-          if (!fun)
-              return false;
-          JSObject *funobj = JS_GetFunctionObject(fun);
-          desc->value.setObject(*funobj);
-          desc->attrs = %(methods)s_specs[i].flags;
-          desc->obj = wrapper;
-          desc->setter = nsnull;
-          desc->getter = nsnull;
-          return true;
-        }
-      }
-    }
-  }
 
-""" % varNames
-
-        attrs = self.properties.attrs
-        if attrs.hasNonChromeOnly() or attrs.hasChromeOnly():
-            str += """  // %(attrs)s has an end-of-list marker at the end that we ignore
-  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(attrs)s)-1; ++prefIdx) {
-    MOZ_ASSERT(%(attrs)s[prefIdx].specs);
-    if (%(attrs)s[prefIdx].enabled) {
-      // Set i to be the index into our full list of ids/specs that we're
-      // looking at now.
-      size_t i = %(attrs)s[prefIdx].specs - %(attrs)s_specs;;
-      for ( ; %(attrs)s_ids[i] != JSID_VOID; ++i) {
-        if (id == %(attrs)s_ids[i]) {
-          desc->attrs = %(attrs)s_specs[i].flags;
-          desc->obj = wrapper;
-          desc->setter = %(attrs)s_specs[i].setter;
-          desc->getter = %(attrs)s_specs[i].getter;
-          return true;
-        }
-      }
-    }
-  }
-
-""" % varNames
-
-        consts = self.properties.consts
-        if consts.hasNonChromeOnly() or consts.hasChromeOnly():
-            str += """  // %(consts)s has an end-of-list marker at the end that we ignore
-  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(consts)s)-1; ++prefIdx) {
-    MOZ_ASSERT(%(consts)s[prefIdx].specs);
-    if (%(consts)s[prefIdx].enabled) {
-      // Set i to be the index into our full list of ids/specs that we're
-      // looking at now.
-      size_t i = %(consts)s[prefIdx].specs - %(consts)s_specs;;
-      for ( ; %(consts)s_ids[i] != JSID_VOID; ++i) {
-        if (id == %(consts)s_ids[i]) {
-          desc->attrs = JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT;
-          desc->obj = wrapper;
-          desc->value = %(consts)s_specs[i].value;
-          return true;
-        }
-      }
-    }
-  }
-
-""" % varNames
-
-        return str + "  return true;"
-
-class CGEnumerateProperties(CGAbstractMethod):
+class CGEnumerateProperties(CGXrayHelper):
     def __init__(self, descriptor, properties):
         args = [Argument('JS::AutoIdVector&', 'props')]
-        CGAbstractMethod.__init__(self, descriptor, "EnumerateProperties", "bool", args)
-        self.properties = properties
-    def definition_body(self):
-        str = ""
+        CGXrayHelper.__init__(self, descriptor, "EnumerateProperties", args,
+                              properties)
 
-        varNames = self.properties.variableNames(True)
-
-        methods = self.properties.methods
-        if methods.hasNonChromeOnly() or methods.hasChromeOnly():
-            str += """  // %(methods)s has an end-of-list marker at the end that we ignore
-  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(methods)s)-1; ++prefIdx) {
-    MOZ_ASSERT(%(methods)s[prefIdx].specs);
-    if (%(methods)s[prefIdx].enabled) {
-      // Set i to be the index into our full list of ids/specs that we're
-      // looking at now.
-      size_t i = %(methods)s[prefIdx].specs - %(methods)s_specs;
-      for ( ; %(methods)s_ids[i] != JSID_VOID; ++i) {
-        if ((%(methods)s_specs[i].flags & JSPROP_ENUMERATE) &&
-            !props.append(%(methods)s_ids[i])) {
-          return false;
-        }
-      }
-    }
-  }
-
-""" % varNames
-
-        attrs = self.properties.attrs
-        if attrs.hasNonChromeOnly() or attrs.hasChromeOnly():
-            str += """  // %(attrs)s has an end-of-list marker at the end that we ignore
-  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(attrs)s)-1; ++prefIdx) {
-    MOZ_ASSERT(%(attrs)s[prefIdx].specs);
-    if (%(attrs)s[prefIdx].enabled) {
-      // Set i to be the index into our full list of ids/specs that we're
-      // looking at now.
-      size_t i = %(attrs)s[prefIdx].specs - %(attrs)s_specs;;
-      for ( ; %(attrs)s_ids[i] != JSID_VOID; ++i) {
-        if ((%(attrs)s_specs[i].flags & JSPROP_ENUMERATE) &&
-            !props.append(%(attrs)s_ids[i])) {
-          return false;
-        }
-      }
-    }
-  }
-
-""" % varNames
-
-        consts = self.properties.consts
-        if consts.hasNonChromeOnly() or consts.hasChromeOnly():
-            str += """  // %(consts)s has an end-of-list marker at the end that we ignore
-  for (size_t prefIdx = 0; prefIdx < ArrayLength(%(consts)s)-1; ++prefIdx) {
-    MOZ_ASSERT(%(consts)s[prefIdx].specs);
-    if (%(consts)s[prefIdx].enabled) {
-      // Set i to be the index into our full list of ids/specs that we're
-      // looking at now.
-      size_t i = %(consts)s[prefIdx].specs - %(consts)s_specs;;
-      for ( ; %(consts)s_ids[i] != JSID_VOID; ++i) {
-        if (!props.append(%(consts)s_ids[i])) {
-          return false;
-        }
-      }
-    }
-  }
-
-""" % varNames
-
-        return str + "  return true;"
+    def getPrefixArgs(self):
+        return "props"
 
 class CGPrototypeTraitsClass(CGClass):
     def __init__(self, descriptor, indent=''):

From cea0e2a6693b03ef112394f923426663d9603a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 18 Jul 2012 16:15:24 +0200
Subject: [PATCH 020/118] Bug 767133 - Add slide-in animation for arrow panels.
 r=Enn,Mossop

---
 browser/base/content/test/browser_bug553455.js |  4 ++--
 .../content/test/browser_popupNotification.js  |  4 ++++
 dom/indexedDB/test/head.js                     |  4 ++++
 .../content/tests/chrome/test_arrowpanel.xul   |  6 +++++-
 toolkit/themes/pinstripe/global/popup.css      | 18 +++++++++++++++++-
 toolkit/themes/winstripe/global/popup.css      | 18 +++++++++++++++++-
 6 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/test/browser_bug553455.js b/browser/base/content/test/browser_bug553455.js
index da43ee1a83c..eec946af11b 100644
--- a/browser/base/content/test/browser_bug553455.js
+++ b/browser/base/content/test/browser_bug553455.js
@@ -711,9 +711,9 @@ function test_cancel_restart() {
 
     // Close the notification
     let anchor = document.getElementById("addons-notification-icon");
-    EventUtils.synthesizeMouseAtCenter(anchor, {});
+    anchor.click();
     // Reopen the notification
-    EventUtils.synthesizeMouseAtCenter(anchor, {});
+    anchor.click();
 
     ok(PopupNotifications.isPanelOpen, "Notification should still be open");
     is(PopupNotifications.panel.childNodes.length, 1, "Should be only one notification");
diff --git a/browser/base/content/test/browser_popupNotification.js b/browser/base/content/test/browser_popupNotification.js
index d6e0263fa71..85c55df5bec 100644
--- a/browser/base/content/test/browser_popupNotification.js
+++ b/browser/base/content/test/browser_popupNotification.js
@@ -738,6 +738,10 @@ function triggerSecondaryCommand(popup, index) {
   ok(notifications.length > 0, "at least one notification displayed");
   let notification = notifications[0];
 
+  // Cancel the arrow panel slide-in transition (bug 767133) such that
+  // it won't interfere with us interacting with the dropdown.
+  document.getAnonymousNodes(popup)[0].style.transition = "none";
+
   notification.button.focus();
 
   popup.addEventListener("popupshown", function () {
diff --git a/dom/indexedDB/test/head.js b/dom/indexedDB/test/head.js
index 610a0588ef3..94da42d9fc3 100644
--- a/dom/indexedDB/test/head.js
+++ b/dom/indexedDB/test/head.js
@@ -58,6 +58,10 @@ function triggerSecondaryCommand(popup, index)
   ok(notifications.length > 0, "at least one notification displayed");
   let notification = notifications[0];
 
+  // Cancel the arrow panel slide-in transition (bug 767133) such that
+  // it won't interfere with us interacting with the dropdown.
+  document.getAnonymousNodes(popup)[0].style.transition = "none";
+
   notification.button.focus();
 
   popup.addEventListener("popupshown", function () {
diff --git a/toolkit/content/tests/chrome/test_arrowpanel.xul b/toolkit/content/tests/chrome/test_arrowpanel.xul
index 687641bc96c..43480bef3c4 100644
--- a/toolkit/content/tests/chrome/test_arrowpanel.xul
+++ b/toolkit/content/tests/chrome/test_arrowpanel.xul
@@ -178,7 +178,11 @@ function checkPanelPosition(panel)
 
   var panelRect = panel.getBoundingClientRect();
   var anchorRect = anchor.getBoundingClientRect();
-  var labelRect = $("panellabel").getBoundingClientRect();
+  var labelBO = $("panellabel").boxObject;
+  var labelRect = { top: labelBO.y,
+                    left: labelBO.x,
+                    bottom: labelBO.y + labelBO.height,
+                    right: labelBO.x + labelBO.width };
   switch (expectedSide) {
     case "top":
       ok(labelRect.top > vwinpos + anchorRect.bottom * zoomFactor + 5, "panel label is below");
diff --git a/toolkit/themes/pinstripe/global/popup.css b/toolkit/themes/pinstripe/global/popup.css
index e6039979603..36febae1c28 100644
--- a/toolkit/themes/pinstripe/global/popup.css
+++ b/toolkit/themes/pinstripe/global/popup.css
@@ -30,7 +30,7 @@ panel[type="arrow"] {
 
 .panel-arrowcontainer[panelopen] {
   transition-duration: 250ms;
-  transition-property: opacity;
+  transition-property: opacity, transform;
   transition-timing-function: ease-out;
 }
 
@@ -38,6 +38,22 @@ panel[type="arrow"] {
   opacity: 0;
 }
 
+.panel-arrowcontainer:not([panelopen])[side="top"] {
+  transform: translateY(-20px);
+}
+
+.panel-arrowcontainer:not([panelopen])[side="bottom"] {
+  transform: translateY(20px);
+}
+
+.panel-arrowcontainer:not([panelopen])[side="left"] {
+  transform: translateX(-20px);
+}
+
+.panel-arrowcontainer:not([panelopen])[side="right"] {
+  transform: translateX(20px);
+}
+
 panel[type="arrow"][side="top"],
 panel[type="arrow"][side="bottom"] {
   margin-left: -26px;
diff --git a/toolkit/themes/winstripe/global/popup.css b/toolkit/themes/winstripe/global/popup.css
index 5532ead229f..cc46d4f6c21 100644
--- a/toolkit/themes/winstripe/global/popup.css
+++ b/toolkit/themes/winstripe/global/popup.css
@@ -38,7 +38,7 @@ panel[type="arrow"] {
 
 .panel-arrowcontainer[panelopen] {
   transition-duration: 250ms;
-  transition-property: opacity;
+  transition-property: opacity, transform;
   transition-timing-function: ease-out;
 }
 
@@ -46,6 +46,22 @@ panel[type="arrow"] {
   opacity: 0;
 }
 
+.panel-arrowcontainer:not([panelopen])[side="top"] {
+  transform: translateY(-20px);
+}
+
+.panel-arrowcontainer:not([panelopen])[side="bottom"] {
+  transform: translateY(20px);
+}
+
+.panel-arrowcontainer:not([panelopen])[side="left"] {
+  transform: translateX(-20px);
+}
+
+.panel-arrowcontainer:not([panelopen])[side="right"] {
+  transform: translateX(20px);
+}
+
 panel[type="arrow"][side="top"],
 panel[type="arrow"][side="bottom"] {
   margin-left: -20px;

From c33326fd5f80d680d78963762555d4036809f029 Mon Sep 17 00:00:00 2001
From: Ekanan Ketunuti <ananuti@gmail.com>
Date: Tue, 17 Jul 2012 20:02:26 +0700
Subject: [PATCH 021/118] Bug 774620 - Unprefix -moz-animation properties and
 @-moz-keyframes rules in browser/. r=dao

---
 browser/themes/gnomestripe/devtools/debugger.css   |  6 +++---
 browser/themes/gnomestripe/downloads/downloads.css | 14 +++++++-------
 browser/themes/pinstripe/devtools/debugger.css     |  6 +++---
 browser/themes/pinstripe/downloads/downloads.css   | 14 +++++++-------
 browser/themes/winstripe/devtools/debugger.css     |  6 +++---
 browser/themes/winstripe/downloads/downloads.css   | 14 +++++++-------
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/browser/themes/gnomestripe/devtools/debugger.css b/browser/themes/gnomestripe/devtools/debugger.css
index 8119f0013e9..cd32fb11fc9 100644
--- a/browser/themes/gnomestripe/devtools/debugger.css
+++ b/browser/themes/gnomestripe/devtools/debugger.css
@@ -252,11 +252,11 @@
  */
 
 .details[open][animated] {
-  -moz-animation-duration: 0.25s;
-  -moz-animation-name: showblock;
+  animation-duration: 0.25s;
+  animation-name: showblock;
 }
 
-@-moz-keyframes showblock {
+@keyframes showblock {
   from {
     opacity: 0;
     transform-origin: top;
diff --git a/browser/themes/gnomestripe/downloads/downloads.css b/browser/themes/gnomestripe/downloads/downloads.css
index 977633136bb..29470e92fda 100644
--- a/browser/themes/gnomestripe/downloads/downloads.css
+++ b/browser/themes/gnomestripe/downloads/downloads.css
@@ -204,25 +204,25 @@ richlistitem[type="download"][state="1"] > .downloadInfo:hover {
   background-size: 16px;
 }
 
-@-moz-keyframes downloadsIndicatorNotificationRight {
+@keyframes downloadsIndicatorNotificationRight {
   from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
-  20%  { opacity: .85; -moz-animation-timing-function: ease-out; }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
   to   { opacity: 0; transform: translate(0) scale(1); }
 }
 
-@-moz-keyframes downloadsIndicatorNotificationLeft {
+@keyframes downloadsIndicatorNotificationLeft {
   from { opacity: 0; transform: translate(128px, 128px) scale(8); }
-  20%  { opacity: .85; -moz-animation-timing-function: ease-out; }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
   to   { opacity: 0; transform: translate(0) scale(1); }
 }
 
 #downloads-indicator[notification] > #downloads-indicator-anchor > #downloads-indicator-notification {
-  -moz-animation-name: downloadsIndicatorNotificationRight;
-  -moz-animation-duration: 1s;
+  animation-name: downloadsIndicatorNotificationRight;
+  animation-duration: 1s;
 }
 
 #downloads-indicator[notification]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #downloads-indicator-notification {
-  -moz-animation-name: downloadsIndicatorNotificationLeft;
+  animation-name: downloadsIndicatorNotificationLeft;
 }
 
 /*** Progress bar and text ***/
diff --git a/browser/themes/pinstripe/devtools/debugger.css b/browser/themes/pinstripe/devtools/debugger.css
index 43ed914f580..251d55a533c 100644
--- a/browser/themes/pinstripe/devtools/debugger.css
+++ b/browser/themes/pinstripe/devtools/debugger.css
@@ -252,11 +252,11 @@
  */
 
 .details[open][animated] {
-  -moz-animation-duration: 0.25s;
-  -moz-animation-name: showblock;
+  animation-duration: 0.25s;
+  animation-name: showblock;
 }
 
-@-moz-keyframes showblock {
+@keyframes showblock {
   from {
     opacity: 0;
     transform-origin: top;
diff --git a/browser/themes/pinstripe/downloads/downloads.css b/browser/themes/pinstripe/downloads/downloads.css
index f4de76c12f0..a9d5e8edb6b 100644
--- a/browser/themes/pinstripe/downloads/downloads.css
+++ b/browser/themes/pinstripe/downloads/downloads.css
@@ -225,25 +225,25 @@ richlistitem[type="download"][state="1"] .downloadInfo:hover {
   background-size: 16px;
 }
 
-@-moz-keyframes downloadsIndicatorNotificationRight {
+@keyframes downloadsIndicatorNotificationRight {
   from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
-  20%  { opacity: .85; -moz-animation-timing-function: ease-out; }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
   to   { opacity: 0; transform: translate(0) scale(1); }
 }
 
-@-moz-keyframes downloadsIndicatorNotificationLeft {
+@keyframes downloadsIndicatorNotificationLeft {
   from { opacity: 0; transform: translate(128px, 128px) scale(8); }
-  20%  { opacity: .85; -moz-animation-timing-function: ease-out; }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
   to   { opacity: 0; transform: translate(0) scale(1); }
 }
 
 #downloads-indicator[notification] > #downloads-indicator-anchor > #downloads-indicator-notification {
-  -moz-animation-name: downloadsIndicatorNotificationRight;
-  -moz-animation-duration: 1s;
+  animation-name: downloadsIndicatorNotificationRight;
+  animation-duration: 1s;
 }
 
 #downloads-indicator[notification]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #downloads-indicator-notification {
-  -moz-animation-name: downloadsIndicatorNotificationLeft;
+  animation-name: downloadsIndicatorNotificationLeft;
 }
 
 /*** Progress bar and text ***/
diff --git a/browser/themes/winstripe/devtools/debugger.css b/browser/themes/winstripe/devtools/debugger.css
index 7628f7ec045..ef7414439eb 100644
--- a/browser/themes/winstripe/devtools/debugger.css
+++ b/browser/themes/winstripe/devtools/debugger.css
@@ -263,11 +263,11 @@
  */
 
 .details[open][animated] {
-  -moz-animation-duration: 0.25s;
-  -moz-animation-name: showblock;
+  animation-duration: 0.25s;
+  animation-name: showblock;
 }
 
-@-moz-keyframes showblock {
+@keyframes showblock {
   from {
     opacity: 0;
     transform-origin: top;
diff --git a/browser/themes/winstripe/downloads/downloads.css b/browser/themes/winstripe/downloads/downloads.css
index ea70ee8200a..3868c55c389 100644
--- a/browser/themes/winstripe/downloads/downloads.css
+++ b/browser/themes/winstripe/downloads/downloads.css
@@ -224,25 +224,25 @@ richlistitem[type="download"][state="1"] > .downloadInfo:hover {
   background-size: 16px;
 }
 
-@-moz-keyframes downloadsIndicatorNotificationRight {
+@keyframes downloadsIndicatorNotificationRight {
   from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
-  20%  { opacity: .85; -moz-animation-timing-function: ease-out; }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
   to   { opacity: 0; transform: translate(0) scale(1); }
 }
 
-@-moz-keyframes downloadsIndicatorNotificationLeft {
+@keyframes downloadsIndicatorNotificationLeft {
   from { opacity: 0; transform: translate(128px, 128px) scale(8); }
-  20%  { opacity: .85; -moz-animation-timing-function: ease-out; }
+  20%  { opacity: .85; animation-timing-function: ease-out; }
   to   { opacity: 0; transform: translate(0) scale(1); }
 }
 
 #downloads-indicator[notification] > #downloads-indicator-anchor > #downloads-indicator-notification {
-  -moz-animation-name: downloadsIndicatorNotificationRight;
-  -moz-animation-duration: 1s;
+  animation-name: downloadsIndicatorNotificationRight;
+  animation-duration: 1s;
 }
 
 #downloads-indicator[notification]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #downloads-indicator-notification {
-  -moz-animation-name: downloadsIndicatorNotificationLeft;
+  animation-name: downloadsIndicatorNotificationLeft;
 }
 
 /*** Progress bar and text ***/

From 3f960753080c7161592e0de9dca69fd7d5acf853 Mon Sep 17 00:00:00 2001
From: Elika Etemad <fantasai@inkedblade.net>
Date: Wed, 18 Jul 2012 10:26:05 -0400
Subject: [PATCH 022/118] Bug 774835: Refactor
 nsHTMLReflowState::ApplyMinMaxConstraints to separate behavior of width and
 height. [r=roc]

--HG--
extra : rebase_source : c6a25e9c19c65d86013ddf8afc15026ca02321c4
---
 layout/forms/nsListControlFrame.cpp  |  4 ++--
 layout/generic/nsBlockFrame.cpp      |  8 +++-----
 layout/generic/nsGfxScrollFrame.cpp  |  3 ++-
 layout/generic/nsHTMLReflowState.cpp | 19 -------------------
 layout/generic/nsHTMLReflowState.h   | 22 ++++++++++++++++++----
 layout/xul/base/src/nsBoxFrame.cpp   |  2 +-
 6 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 98de719b90f..c60bcc3e1dd 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -427,7 +427,7 @@ nsListControlFrame::Reflow(nsPresContext*           aPresContext,
     // When not doing an initial reflow, and when the height is auto, start off
     // with our computed height set to what we'd expect our height to be.
     nscoord computedHeight = CalcIntrinsicHeight(oldHeightOfARow, length);
-    state.ApplyMinMaxConstraints(nsnull, &computedHeight);
+    computedHeight = state.ApplyMinMaxHeight(computedHeight);
     state.SetComputedHeight(computedHeight);
   }
 
@@ -485,7 +485,7 @@ nsListControlFrame::Reflow(nsPresContext*           aPresContext,
 
   // Now compute the height we want to have
   nscoord computedHeight = CalcIntrinsicHeight(HeightOfARow(), length); 
-  state.ApplyMinMaxConstraints(nsnull, &computedHeight);
+  computedHeight = state.ApplyMinMaxHeight(computedHeight);
   state.SetComputedHeight(computedHeight);
 
   nsHTMLScrollFrame::WillReflow(aPresContext);
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 46b9ba085f9..7a9b6b231b5 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -1429,11 +1429,9 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
     aMetrics.mCarriedOutBottomMargin.Zero();
   }
   else if (NS_FRAME_IS_COMPLETE(aState.mReflowStatus)) {
-    nscoord autoHeight = bottomEdgeOfChildren;
-    autoHeight -= borderPadding.top;
-    nscoord oldAutoHeight = autoHeight;
-    aReflowState.ApplyMinMaxConstraints(nsnull, &autoHeight);
-    if (autoHeight != oldAutoHeight) {
+    nscoord contentHeight = bottomEdgeOfChildren - borderPadding.top;
+    nscoord autoHeight = aReflowState.ApplyMinMaxHeight(contentHeight);
+    if (autoHeight != contentHeight) {
       // Our min-height or max-height made our height change.  Don't carry out
       // our kids' bottom margins.
       aMetrics.mCarriedOutBottomMargin.Zero();
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 33af8d46f8f..4261e14c9b4 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -298,7 +298,8 @@ static nsSize ComputeInsideBorderSize(ScrollReflowState* aState,
       aState->mReflowState.mComputedPadding.TopBottom();
   }
 
-  aState->mReflowState.ApplyMinMaxConstraints(&contentWidth, &contentHeight);
+  contentWidth  = aState->mReflowState.ApplyMinMaxWidth(contentWidth);
+  contentHeight = aState->mReflowState.ApplyMinMaxHeight(contentHeight);
   return nsSize(contentWidth + aState->mReflowState.mComputedPadding.LeftRight(),
                 contentHeight + aState->mReflowState.mComputedPadding.TopBottom());
 }
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 692de1b5c6d..4b641b7cc08 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -2426,25 +2426,6 @@ nsCSSOffsetState::ComputePadding(nscoord aContainingBlockWidth, nsIAtom* aFrameT
   return isWidthDependent;
 }
 
-void
-nsHTMLReflowState::ApplyMinMaxConstraints(nscoord* aFrameWidth,
-                                          nscoord* aFrameHeight) const
-{
-  if (aFrameWidth) {
-    if (NS_UNCONSTRAINEDSIZE != mComputedMaxWidth) {
-      *aFrameWidth = NS_MIN(*aFrameWidth, mComputedMaxWidth);
-    }
-    *aFrameWidth = NS_MAX(*aFrameWidth, mComputedMinWidth);
-  }
-
-  if (aFrameHeight) {
-    if (NS_UNCONSTRAINEDSIZE != mComputedMaxHeight) {
-      *aFrameHeight = NS_MIN(*aFrameHeight, mComputedMaxHeight);
-    }
-    *aFrameHeight = NS_MAX(*aFrameHeight, mComputedMinHeight);
-  }
-}
-
 void
 nsHTMLReflowState::ComputeMinMaxValues(nscoord aContainingBlockWidth,
                                        nscoord aContainingBlockHeight,
diff --git a/layout/generic/nsHTMLReflowState.h b/layout/generic/nsHTMLReflowState.h
index 127aedc35a4..8fcbaff743d 100644
--- a/layout/generic/nsHTMLReflowState.h
+++ b/layout/generic/nsHTMLReflowState.h
@@ -413,11 +413,25 @@ public:
                                        nscoord&                 aContainingBlockHeight);
 
   /**
-   * Apply the mComputed(Min/Max)(Width/Height) values to the content
-   * size computed so far. If a passed-in pointer is null, we skip
-   * adjusting that dimension.
+   * Apply the mComputed(Min/Max)Width constraints to the content
+   * size computed so far.
    */
-  void ApplyMinMaxConstraints(nscoord* aContentWidth, nscoord* aContentHeight) const;
+  nscoord ApplyMinMaxWidth(nscoord aWidth) const {
+    if (NS_UNCONSTRAINEDSIZE != mComputedMaxWidth) {
+      aWidth = NS_MIN(aWidth, mComputedMaxWidth);
+    }
+    return NS_MAX(aWidth, mComputedMinWidth);
+  }
+  /**
+   * Apply the mComputed(Min/Max)Height constraints to the content
+   * size computed so far.
+   */
+  nscoord ApplyMinMaxHeight(nscoord aHeight) const {
+    if (NS_UNCONSTRAINEDSIZE != mComputedMaxHeight) {
+      aHeight = NS_MIN(aHeight, mComputedMaxHeight);
+    }
+    return NS_MAX(aHeight, mComputedMinHeight);
+  }
 
   bool ShouldReflowAllKids() const {
     // Note that we could make a stronger optimization for mVResize if
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 817b729a9d9..0159bbda6b0 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -688,7 +688,7 @@ nsBoxFrame::Reflow(nsPresContext*          aPresContext,
     computedSize.height -= outsideBoxSizing;
     // Note: might be negative now, but that's OK because min-width is
     // never negative.
-    aReflowState.ApplyMinMaxConstraints(nsnull, &computedSize.height);
+    computedSize.height = aReflowState.ApplyMinMaxHeight(computedSize.height);
     computedSize.height += outsideBoxSizing;
   } else {
     computedSize.height += m.top + m.bottom;

From c24522638b5b05c7511db8237fb9127b922c2cac Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Wed, 18 Jul 2012 16:28:53 +0200
Subject: [PATCH 023/118] Bug 539356 - Followup: Fix unused variable warnings;
 r=mattwoodrow over IRC.

---
 layout/base/nsDisplayList.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index a866caa2851..beb462d6220 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -3305,9 +3305,9 @@ nsDisplaySVGEffects::BuildLayer(nsDisplayListBuilder* aBuilder,
     nsSVGEffects::GetEffectProperties(firstFrame);
 
   bool isOK = true;
-  nsSVGClipPathFrame *clipPathFrame = effectProperties.GetClipPathFrame(&isOK);
-  nsSVGMaskFrame *maskFrame = effectProperties.GetMaskFrame(&isOK);
-  nsSVGFilterFrame *filterFrame = effectProperties.GetFilterFrame(&isOK);
+  effectProperties.GetClipPathFrame(&isOK);
+  effectProperties.GetMaskFrame(&isOK);
+  effectProperties.GetFilterFrame(&isOK);
 
   if (!isOK) {
     return nsnull;

From c7030aa08e3c52ecbcc461267ad64f4320f8c9ee Mon Sep 17 00:00:00 2001
From: Dale Harvey <dale@arandomurl.com>
Date: Wed, 18 Jul 2012 10:45:28 -0400
Subject: [PATCH 024/118] Bug 709759 - Add stop() to mozbrowser API. r=jlebar

---
 dom/browser-element/BrowserElementChild.js    |  6 +++
 dom/browser-element/BrowserElementParent.js   |  5 +++
 dom/browser-element/mochitest/Makefile.in     |  4 ++
 .../mochitest/browserElement_Stop.js          | 42 +++++++++++++++++++
 .../mochitest/file_bug709759.sjs              |  5 +++
 .../test_browserElement_inproc_Stop.html      | 13 ++++++
 .../test_browserElement_oop_Stop.html         | 13 ++++++
 7 files changed, 88 insertions(+)
 create mode 100644 dom/browser-element/mochitest/browserElement_Stop.js
 create mode 100644 dom/browser-element/mochitest/file_bug709759.sjs
 create mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_Stop.html
 create mode 100644 dom/browser-element/mochitest/test_browserElement_oop_Stop.html

diff --git a/dom/browser-element/BrowserElementChild.js b/dom/browser-element/BrowserElementChild.js
index a24e8597f6b..84ceda83751 100644
--- a/dom/browser-element/BrowserElementChild.js
+++ b/dom/browser-element/BrowserElementChild.js
@@ -122,6 +122,7 @@ BrowserElementChild.prototype = {
     addMsgListener("go-back", this._recvGoBack);
     addMsgListener("go-forward", this._recvGoForward);
     addMsgListener("reload", this._recvReload);
+    addMsgListener("stop", this._recvStop);
     addMsgListener("unblock-modal-prompt", this._recvStopWaiting);
     addMsgListener("fire-ctx-callback", this._recvFireCtxCallback);
 
@@ -481,6 +482,11 @@ BrowserElementChild.prototype = {
     }
   },
 
+  _recvStop: function(data) {
+    let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
+    webNav.stop(webNav.STOP_NETWORK);
+  },
+
   _keyEventHandler: function(e) {
     if (whitelistedEvents.indexOf(e.keyCode) != -1 && !e.defaultPrevented) {
       sendAsyncMsg('keyevent', {
diff --git a/dom/browser-element/BrowserElementParent.js b/dom/browser-element/BrowserElementParent.js
index d65af445290..0dea3c2b78c 100644
--- a/dom/browser-element/BrowserElementParent.js
+++ b/dom/browser-element/BrowserElementParent.js
@@ -169,6 +169,7 @@ function BrowserElementParent(frameLoader) {
   defineMethod('goBack', this._goBack);
   defineMethod('goForward', this._goForward);
   defineMethod('reload', this._reload);
+  defineMethod('stop', this._stop);
   defineDOMRequestMethod('getScreenshot', 'get-screenshot');
   defineDOMRequestMethod('getCanGoBack', 'get-can-go-back');
   defineDOMRequestMethod('getCanGoForward', 'get-can-go-forward');
@@ -341,6 +342,10 @@ BrowserElementParent.prototype = {
     this._sendAsyncMsg('reload', {hardReload: hardReload});
   },
 
+  _stop: function() {
+    this._sendAsyncMsg('stop');
+  },
+
   _fireKeyEvent: function(data) {
     let evt = this._window.document.createEvent("KeyboardEvent");
     evt.initKeyEvent(data.json.type, true, true, this._window,
diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in
index 0986f0773cd..bfb0fa9a1f1 100644
--- a/dom/browser-element/mochitest/Makefile.in
+++ b/dom/browser-element/mochitest/Makefile.in
@@ -81,6 +81,9 @@ MOCHITEST_FILES = \
 		browserElement_BackForward.js \
 	        file_bug741717.sjs \
 		browserElement_Reload.js \
+	        file_bug709759.sjs \
+		browserElement_Stop.js \
+                test_browserElement_inproc_Stop.html \
                 browserElement_ContextmenuEvents.js \
                 test_browserElement_inproc_ContextmenuEvents.html \
 		$(NULL)
@@ -119,6 +122,7 @@ MOCHITEST_FILES += \
 		test_browserElement_oop_SecurityChange.html \
 		test_browserElement_oop_BackForward.html \
 		test_browserElement_oop_Reload.html \
+		test_browserElement_oop_Stop.html \
                 test_browserElement_oop_ContextmenuEvents.html \
 		$(NULL)
 endif #}
diff --git a/dom/browser-element/mochitest/browserElement_Stop.js b/dom/browser-element/mochitest/browserElement_Stop.js
new file mode 100644
index 00000000000..f28b3baad5a
--- /dev/null
+++ b/dom/browser-element/mochitest/browserElement_Stop.js
@@ -0,0 +1,42 @@
+/* Any copyright is dedicated to the public domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Bug 709759 - Test the stop ability of <iframe mozbrowser>.
+
+// The img that is loaded will never be returned and will block
+// the page from loading, the timeout ensures that the page is
+// actually blocked from loading, once stop is called the
+// image load will be cancaelled and mozbrowserloadend should be called.
+
+"use strict";
+SimpleTest.waitForExplicitFinish();
+
+var iframe;
+var stopped = false;
+var imgSrc = 'http://test/tests/dom/browser-element/mochitest/file_bug709759.sjs';
+
+function runTest() {
+  browserElementTestHelpers.setEnabledPref(true);
+  browserElementTestHelpers.addToWhitelist();
+
+  iframe = document.createElement('iframe');
+  iframe.mozbrowser = true;
+
+  iframe.addEventListener('mozbrowserloadend', loadend);
+  iframe.src = 'data:text/html,<html>' +
+    '<body><img src="' + imgSrc + '" /></body></html>';
+
+  document.body.appendChild(iframe);
+
+  setTimeout(function() {
+    stopped = true;
+    iframe.stop();
+  }, 200);
+}
+
+function loadend() {
+  ok(stopped, 'Iframes network connections were stopped');
+  SimpleTest.finish();
+}
+
+runTest();
diff --git a/dom/browser-element/mochitest/file_bug709759.sjs b/dom/browser-element/mochitest/file_bug709759.sjs
new file mode 100644
index 00000000000..ce78b188b3a
--- /dev/null
+++ b/dom/browser-element/mochitest/file_bug709759.sjs
@@ -0,0 +1,5 @@
+function handleRequest(request, response)
+{
+  response.processAsync();
+  response.setHeader("Content-Type", "image/jpeg", false);
+}
\ No newline at end of file
diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_Stop.html b/dom/browser-element/mochitest/test_browserElement_inproc_Stop.html
new file mode 100644
index 00000000000..3425944e8a7
--- /dev/null
+++ b/dom/browser-element/mochitest/test_browserElement_inproc_Stop.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test of browser element.</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<script type="application/javascript;version=1.7" src="browserElement_Stop.js">
+</script>
+</body>
+</html>
diff --git a/dom/browser-element/mochitest/test_browserElement_oop_Stop.html b/dom/browser-element/mochitest/test_browserElement_oop_Stop.html
new file mode 100644
index 00000000000..3425944e8a7
--- /dev/null
+++ b/dom/browser-element/mochitest/test_browserElement_oop_Stop.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test of browser element.</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="browserElementTestHelpers.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<script type="application/javascript;version=1.7" src="browserElement_Stop.js">
+</script>
+</body>
+</html>

From d8084344033a66e5647d5e953f2b25a028fb2644 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 18 Jul 2012 07:58:02 -0700
Subject: [PATCH 025/118] Bug 772050 - Remove 'classInfo' from AppsService and
 SettingsService. r=gwagner

---
 dom/apps/src/AppsService.js     |  7 -------
 dom/settings/SettingsService.js | 10 +---------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/dom/apps/src/AppsService.js b/dom/apps/src/AppsService.js
index 98634a927b6..14ce95efbab 100644
--- a/dom/apps/src/AppsService.js
+++ b/dom/apps/src/AppsService.js
@@ -14,7 +14,6 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Webapps.jsm");
 
-const APPS_SERVICE_CONTRACTID = "@mozilla.org/AppsService;1";
 const APPS_SERVICE_CID        = Components.ID("{05072afa-92fe-45bf-ae22-39b69c117058}");
 
 function AppsService()
@@ -35,12 +34,6 @@ AppsService.prototype = {
 
   classID : APPS_SERVICE_CID,
   QueryInterface : XPCOMUtils.generateQI([Ci.nsIAppsService]),
-
-  classInfo : XPCOMUtils.generateCI({classID: APPS_SERVICE_CID,
-                                     contractID: APPS_SERVICE_CONTRACTID,
-                                     classDescription: "AppsService",
-                                     interfaces: [Ci.nsIAppsService],
-                                     flags: Ci.nsIClassInfo.DOM_OBJECT})
 }
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([AppsService])
diff --git a/dom/settings/SettingsService.js b/dom/settings/SettingsService.js
index efb2193b2f6..49f92f728d0 100644
--- a/dom/settings/SettingsService.js
+++ b/dom/settings/SettingsService.js
@@ -133,9 +133,7 @@ SettingsServiceLock.prototype = {
                                      flags: nsIClassInfo.DOM_OBJECT})
 };
 
-const SETTINGSSERVICE_CONTRACTID = "@mozilla.org/settingsService;1";
 const SETTINGSSERVICE_CID        = Components.ID("{3458e760-8513-11e1-b0c4-0800200c9a66}");
-const nsISettingsService         = Ci.nsISettingsService;
 
 let myGlobal = this;
 
@@ -171,13 +169,7 @@ SettingsService.prototype = {
   },
 
   classID : SETTINGSSERVICE_CID,
-  QueryInterface : XPCOMUtils.generateQI([nsISettingsService]),
-
-  classInfo : XPCOMUtils.generateCI({classID: SETTINGSSERVICE_CID,
-                                     contractID: SETTINGSSERVICE_CONTRACTID,
-                                     classDescription: "SettingsService",
-                                     interfaces: [nsISettingsService],
-                                     flags: nsIClassInfo.DOM_OBJECT})
+  QueryInterface : XPCOMUtils.generateQI([Ci.nsISettingsService]),
 }
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([SettingsService, SettingsServiceLock])

From 2f9e4203f92a70b9b85b528aaa3a26b08bc0d481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Wed, 18 Jul 2012 09:31:15 -0400
Subject: [PATCH 026/118] Bug 733905 - switch OS X builds to clang. r=ehsan.

--HG--
extra : rebase_source : aec96c90aecafc757d3ce759eb7d80c0c8e3d965
---
 .../config/mozconfigs/macosx-universal/nightly |  1 -
 browser/config/mozconfigs/macosx32/debug       |  1 -
 browser/config/mozconfigs/macosx64/debug       |  1 -
 .../tooltool-manifests/macosx32/clang.manifest | 18 +++++++++++++++++-
 .../macosx32/releng.manifest                   | 18 +++++++++++++++++-
 .../macosx64/releng.manifest                   | 18 +++++++++++++++++-
 build/macosx/common                            |  4 ++--
 7 files changed, 53 insertions(+), 8 deletions(-)
 mode change 120000 => 100644 browser/config/tooltool-manifests/macosx32/clang.manifest

diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
index 4e782a0c109..43ed34512f5 100644
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -23,7 +23,6 @@ ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
-ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx32/debug b/browser/config/mozconfigs/macosx32/debug
index 840e6678f75..e3dcc5d4f86 100644
--- a/browser/config/mozconfigs/macosx32/debug
+++ b/browser/config/mozconfigs/macosx32/debug
@@ -11,7 +11,6 @@ mk_add_options MOZ_MAKE_FLAGS="-j12"
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-macbundlename-prefix=Firefox
-ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
index 9d53d7dca38..e4d015b8a74 100644
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -16,7 +16,6 @@ ac_add_options --with-macbundlename-prefix=Firefox
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
-ac_add_options --with-ccache
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/tooltool-manifests/macosx32/clang.manifest b/browser/config/tooltool-manifests/macosx32/clang.manifest
deleted file mode 120000
index 3bb28c492ff..00000000000
--- a/browser/config/tooltool-manifests/macosx32/clang.manifest
+++ /dev/null
@@ -1 +0,0 @@
-../macosx64/clang.manifest
\ No newline at end of file
diff --git a/browser/config/tooltool-manifests/macosx32/clang.manifest b/browser/config/tooltool-manifests/macosx32/clang.manifest
new file mode 100644
index 00000000000..43a803b5926
--- /dev/null
+++ b/browser/config/tooltool-manifests/macosx32/clang.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r160364"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 54422251,
+"digest": "8208645d24ac87975a091ff66a90c20589ff8945936ed9b16ca81976c59bf1166ed9f79709698d435480774fba8ed9f9f178dc189305c86162acac8fda19830e",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/browser/config/tooltool-manifests/macosx32/releng.manifest b/browser/config/tooltool-manifests/macosx32/releng.manifest
index fe51488c706..43a803b5926 100644
--- a/browser/config/tooltool-manifests/macosx32/releng.manifest
+++ b/browser/config/tooltool-manifests/macosx32/releng.manifest
@@ -1 +1,17 @@
-[]
+[
+{
+"clang_version": "r160364"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 54422251,
+"digest": "8208645d24ac87975a091ff66a90c20589ff8945936ed9b16ca81976c59bf1166ed9f79709698d435480774fba8ed9f9f178dc189305c86162acac8fda19830e",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/browser/config/tooltool-manifests/macosx64/releng.manifest b/browser/config/tooltool-manifests/macosx64/releng.manifest
index fe51488c706..43a803b5926 100644
--- a/browser/config/tooltool-manifests/macosx64/releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/releng.manifest
@@ -1 +1,17 @@
-[]
+[
+{
+"clang_version": "r160364"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 54422251,
+"digest": "8208645d24ac87975a091ff66a90c20589ff8945936ed9b16ca81976c59bf1166ed9f79709698d435480774fba8ed9f9f178dc189305c86162acac8fda19830e",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/build/macosx/common b/build/macosx/common
index b532039a234..c638f9a7249 100644
--- a/build/macosx/common
+++ b/build/macosx/common
@@ -1,4 +1,4 @@
-CC=/usr/bin/gcc-4.2
-CXX=/usr/bin/g++-4.2
+export CC=$topsrcdir/clang/bin/clang
+export CXX=$topsrcdir/clang/bin/clang++
 
 ac_add_options --enable-stdcxx-compat

From d62854f51b462021bb9418dcbde2b8b51e9a49f7 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 18 Jul 2012 11:23:16 -0400
Subject: [PATCH 027/118] Bug 766647 - Do a better job of coalescing the
 low-res screenshots. r=blassey

---
 mobile/android/base/GeckoApp.java      |   2 +-
 mobile/android/base/GeckoAppShell.java | 474 ++++++++++++++-----------
 mobile/android/base/gfx/IntSize.java   |  19 +-
 3 files changed, 289 insertions(+), 206 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 785821f4d61..3ccf83d0290 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -774,7 +774,7 @@ abstract public class GeckoApp
 
             int dw = tab.getThumbnailWidth();
             int dh = tab.getThumbnailHeight();
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createScreenshotEvent(tab.getId(), 0, 0, 0, 0, 0, 0, dw, dh, dw, dh, GeckoAppShell.SCREENSHOT_THUMBNAIL, tab.getThumbnailBuffer()));
+            GeckoAppShell.sendEventToGecko(GeckoEvent.createScreenshotEvent(tab.getId(), 0, 0, 0, 0, 0, 0, dw, dh, dw, dh, ScreenshotHandler.SCREENSHOT_THUMBNAIL, tab.getThumbnailBuffer()));
         }
     }
 
diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index 3332710bf79..fab7f1cd6c1 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -85,10 +85,6 @@ public class GeckoAppShell
     public static final String SHORTCUT_TYPE_WEBAPP = "webapp";
     public static final String SHORTCUT_TYPE_BOOKMARK = "bookmark";
 
-    static public final int SCREENSHOT_THUMBNAIL = 0;
-    static public final int SCREENSHOT_CHECKERBOARD = 1;
-    static public final int SCREENSHOT_CHECKERBOARD_AND_UPDATE = 2;
-
     static public final int RESTORE_NONE = 0;
     static public final int RESTORE_OOM = 1;
     static public final int RESTORE_CRASH = 2;
@@ -2306,91 +2302,57 @@ public class GeckoAppShell
 
 }
 
-class ScreenshotHandler {
-    private static Queue<PendingScreenshot> sPendingScreenshots = new LinkedList<PendingScreenshot>();
-    private static RectF sCheckerboardPageRect;
-    private static float sLastCheckerboardWidthRatio, sLastCheckerboardHeightRatio;
-    private static RepaintRunnable sRepaintRunnable = new RepaintRunnable();
-    private static int sMaxTextureSize = 0;
-    private static final String LOGTAG = "GeckoScreenshot";
-    private static boolean sDisableScreenshot = false;
-    private static ByteBuffer sWholePageScreenshotBuffer;
-    private static int sCheckerboardBufferWidth, sCheckerboardBufferHeight;
-    private static Rect sAcumulatedRect = new Rect();
+class ScreenshotHandler implements Runnable {
+    public static final int SCREENSHOT_THUMBNAIL = 0;
+    public static final int SCREENSHOT_CHECKERBOARD = 1;
 
-    static class RepaintRunnable implements Runnable {
-        private boolean mIsRepaintRunnablePosted = false;
-        private float mDirtyTop = Float.POSITIVE_INFINITY, mDirtyLeft = Float.POSITIVE_INFINITY;
-        private float mDirtyBottom = Float.NEGATIVE_INFINITY, mDirtyRight = Float.NEGATIVE_INFINITY;
+    private static final String LOGTAG = "GeckoScreenshotHandler";
+    private static final int BYTES_FOR_16BPP = 2;
+    private static final int MAX_PIXELS_PER_SLICE = 100000;
 
-        public void run() {
-            float top, left, bottom, right;
-            // synchronize so we don't try to accumulate more rects while painting the ones we have
-            synchronized(this) {
-                top = mDirtyTop;
-                left = mDirtyLeft;
-                right = mDirtyRight;
-                bottom = mDirtyBottom;
-                // reset these to infinity to start accumulating again
-                mDirtyTop = Float.POSITIVE_INFINITY;
-                mDirtyLeft = Float.POSITIVE_INFINITY;
-                mDirtyBottom = Float.NEGATIVE_INFINITY;
-                mDirtyRight = Float.NEGATIVE_INFINITY;
-                mIsRepaintRunnablePosted = false;
-            }
+    private static boolean sDisableScreenshot;
+    private static ScreenshotHandler sInstance;
 
+    private final int mMaxTextureSize;
+    private final int mMinTextureSize;
+    private final int mMaxPixels;
 
-            Tab tab = Tabs.getInstance().getSelectedTab();
-            if (tab == null)
-                return;
-            LayerController layerController = GeckoApp.mAppContext.getLayerController();
-            if (layerController == null)
-                return;
-            ImmutableViewportMetrics viewport = layerController.getViewportMetrics();
-            
-            if (RectUtils.fuzzyEquals(sCheckerboardPageRect, viewport.getCssPageRect())) {
-                float width = right - left;
-                float height = bottom - top;
-                scheduleCheckerboardScreenshotEvent(tab.getId(), 
-                                                    (int)left, (int)top, (int)width, (int)height, 
-                                                    (int)(sLastCheckerboardWidthRatio * (left - viewport.cssPageRectLeft)),
-                                                    (int)(sLastCheckerboardHeightRatio * (top - viewport.cssPageRectTop)),
-                                                    (int)(sLastCheckerboardWidthRatio * width),
-                                                    (int)(sLastCheckerboardHeightRatio * height),
-                                                    sCheckerboardBufferWidth, sCheckerboardBufferHeight);
-            } else {
-                GeckoAppShell.screenshotWholePage(tab);
+    private final Queue<PendingScreenshot> mPendingScreenshots;
+    private final ByteBuffer mBuffer;
+    private int mBufferWidth;
+    private int mBufferHeight;
+    private RectF mPageRect;
+    private float mWidthRatio;
+    private float mHeightRatio;
+
+    private int mTabId;
+    private RectF mDirtyRect;
+    private boolean mIsRepaintRunnablePosted;
+
+    private static synchronized ScreenshotHandler getInstance() {
+        if (sInstance == null) {
+            try {
+                sInstance = new ScreenshotHandler();
+            } catch (UnsupportedOperationException e) {
+                // initialization failed, fall through and return null
             }
         }
+        return sInstance;
+    }
 
-        void addRectToRepaint(float top, float left, float bottom, float right) {
-            if (sDisableScreenshot || sCheckerboardPageRect == null) {
-                // if screenshotting is disabled just ignore the rect to repaint.
-                // if sCheckerboardPageRect is null, we haven't done a full-page
-                // screenshot yet (or screenshotWholePage failed for some reason),
-                // so ignore partial updates.
-                return;
-            }
-            synchronized(this) {
-                ImmutableViewportMetrics viewport = GeckoApp.mAppContext.getLayerController().getViewportMetrics();
-                mDirtyTop = Math.max(sCheckerboardPageRect.top, Math.min(top, mDirtyTop));
-                mDirtyLeft = Math.max(sCheckerboardPageRect.left, Math.min(left, mDirtyLeft));
-                mDirtyBottom = Math.min(sCheckerboardPageRect.bottom, Math.max(bottom, mDirtyBottom));
-                mDirtyRight = Math.min(sCheckerboardPageRect.right, Math.max(right, mDirtyRight));
-                if (!mIsRepaintRunnablePosted) {
-                    GeckoAppShell.getHandler().postDelayed(this, 5000);
-                    mIsRepaintRunnablePosted = true;
-                }
-            }
+    private ScreenshotHandler() {
+        int[] maxTextureSize = new int[1];
+        GLES20.glGetIntegerv(GLES20.GL_MAX_TEXTURE_SIZE, maxTextureSize, 0);
+        mMaxTextureSize = maxTextureSize[0];
+        if (mMaxTextureSize == 0) {
+            throw new UnsupportedOperationException();
         }
-    }
-
-    public static void notifyPaintedRect(float top, float left, float bottom, float right) {
-        sRepaintRunnable.addRectToRepaint(top, left, bottom, right);
-    }
-
-    private static int clamp(int min, int val, int max) {
-        return Math.max(Math.min(max, val), min);
+        mMaxPixels = Math.min(ScreenshotLayer.getMaxNumPixels(), mMaxTextureSize * mMaxTextureSize);
+        mMinTextureSize = (int)Math.ceil(mMaxPixels / mMaxTextureSize);
+        mPendingScreenshots = new LinkedList<PendingScreenshot>();
+        mBuffer = GeckoAppShell.allocateDirectBuffer(mMaxPixels * BYTES_FOR_16BPP);
+        mDirtyRect = new RectF();
+        clearDirtyRect();
     }
 
     // Invoked via reflection from robocop test
@@ -2399,151 +2361,225 @@ class ScreenshotHandler {
     }
 
     public static void screenshotWholePage(Tab tab) {
+        if (sDisableScreenshot || GeckoApp.mAppContext.isApplicationInBackground()) {
+            return;
+        }
+        ScreenshotHandler handler = getInstance();
+        if (handler == null) {
+            return;
+        }
+
+        handler.screenshotWholePage(tab.getId());
+    }
+
+    private void screenshotWholePage(int tabId) {
+        LayerController layerController = GeckoApp.mAppContext.getLayerController();
+        if (layerController == null) {
+            return;
+        }
+        ImmutableViewportMetrics viewport = layerController.getViewportMetrics();
+        RectF pageRect = viewport.getCssPageRect();
+
+        if (FloatUtils.fuzzyEquals(pageRect.width(), 0) || FloatUtils.fuzzyEquals(pageRect.height(), 0)) {
+            return;
+        }
+
+        synchronized (this) {
+            // if we're doing a full-page screenshot, toss any
+            // dirty rects we have saved up and reset the tab id.
+            mTabId = tabId;
+            clearDirtyRect();
+        }
+        synchronized (mPendingScreenshots) {
+            for (Iterator<PendingScreenshot> i = mPendingScreenshots.iterator(); i.hasNext(); ) {
+                i.next().discard();
+            }
+        }
+
+        int dstx = 0;
+        int dsty = 0;
+        float bestZoomFactor = (float)Math.sqrt(pageRect.width() * pageRect.height() / mMaxPixels);
+        int dstw = IntSize.largestPowerOfTwoLessThan(pageRect.width() / bestZoomFactor);
+        // clamp with min texture size so that the height doesn't exceed the sMaxTextureSize
+        dstw = clamp(mMinTextureSize, dstw, mMaxTextureSize);
+        int dsth = mMaxPixels / dstw;
+
+        mPageRect = pageRect;
+        mBufferWidth = dstw;
+        mBufferHeight = dsth;
+        mWidthRatio = dstw / pageRect.width();
+        mHeightRatio = dsth / pageRect.height();
+
+        scheduleCheckerboardScreenshotEvent(pageRect, dstx, dsty, dstw, dsth);
+    }
+
+    private static int clamp(int min, int val, int max) {
+        return Math.max(Math.min(max, val), min);
+    }
+
+    public static void notifyPaintedRect(float top, float left, float bottom, float right) {
         if (sDisableScreenshot) {
             return;
         }
-        if (GeckoApp.mAppContext.isApplicationInBackground())
+        ScreenshotHandler handler = getInstance();
+        if (handler == null) {
             return;
-
-        if (sMaxTextureSize == 0) {
-            int[] maxTextureSize = new int[1];
-            GLES20.glGetIntegerv(GLES20.GL_MAX_TEXTURE_SIZE, maxTextureSize, 0);
-            sMaxTextureSize = maxTextureSize[0];
-            if (sMaxTextureSize == 0)
-                return;
-            sWholePageScreenshotBuffer = GeckoAppShell.allocateDirectBuffer(ScreenshotLayer.getMaxNumPixels() * 2 /* 16 bpp */);
         }
 
-        ImmutableViewportMetrics viewport = GeckoApp.mAppContext.getLayerController().getViewportMetrics();
-        Log.i(LOGTAG, "Taking whole-screen screenshot, viewport: " + viewport);
-        // source width and height to screenshot
-        float sx = viewport.cssPageRectLeft;
-        float sy = viewport.cssPageRectTop;
-        float sw = viewport.cssPageRectRight - viewport.cssPageRectLeft;
-        float sh = viewport.cssPageRectBottom - viewport.cssPageRectTop;
-        if (sw == 0 || sh == 0)
-            return;
-        int maxPixels = Math.min(ScreenshotLayer.getMaxNumPixels(), sMaxTextureSize * sMaxTextureSize);
-        // 2Mb of 16bit image data
-        // may be bumped by up to 4x for power of 2 alignment
-        float idealZoomFactor = (float)Math.sqrt((sw * sh) / (maxPixels / 4));
-
-        // calc destination width and hight
-        int idealDstWidth = IntSize.nextPowerOfTwo(sw / idealZoomFactor);
-        // min texture size such that the other dimention doesn't excede the max
-        int minTextureSize = maxPixels / sMaxTextureSize;
-        int dx = 0;
-        int dy = 0;
-        int dw = clamp(minTextureSize, idealDstWidth, sMaxTextureSize);
-        int dh = maxPixels / dw;
-        sCheckerboardBufferWidth = dw;
-        sCheckerboardBufferHeight = dh;
-
-        sLastCheckerboardWidthRatio = dw / sw;
-        sLastCheckerboardHeightRatio = dh / sh;
-        sCheckerboardPageRect = viewport.getCssPageRect();
-        scheduleCheckerboardScreenshotEvent(tab.getId(), (int)sx, (int)sy, (int)sw, (int)sh, dx, dy, dw, dh, dw, dh);
+        handler.notifyPageUpdated(top, left, bottom, right);
     }
 
-    static void scheduleCheckerboardScreenshotEvent(int tabId, int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int bw, int bh) {
-        float totalSize = sw * sh;
-        int numSlices = (int) Math.ceil(totalSize / 100000);
-        if (numSlices == 0 || dw == 0 || dh == 0)
-            return;
-        int srcSliceSize = (int) Math.ceil(sh / numSlices);
-        int dstSliceSize = (int) Math.ceil(dh / numSlices);
-        for (int i = 0; i < numSlices; i++) {
-            GeckoEvent event =
-                GeckoEvent.createScreenshotEvent(tabId, 
-                                                 sx, sy + srcSliceSize * i,  sw, srcSliceSize, 
-                                                 dx, dy + dstSliceSize * i,  dw, dstSliceSize, bw, bh,
-                                                 i < numSlices - 1 ? 
-                                                 GeckoAppShell.SCREENSHOT_CHECKERBOARD
-                                                 : GeckoAppShell.SCREENSHOT_CHECKERBOARD_AND_UPDATE,
-                                                 sWholePageScreenshotBuffer);
-            synchronized(sPendingScreenshots) {
-                sPendingScreenshots.add(new PendingScreenshot(tabId, event));
-                if (sPendingScreenshots.size() == 1)
-                    sendNextEventToGecko();
+    private void notifyPageUpdated(float top, float left, float bottom, float right) {
+        synchronized (this) {
+            if (mPageRect == null || Tabs.getInstance().getSelectedTab().getId() != mTabId) {
+                // if mPageRect is null, we haven't done a full-page
+                // screenshot yet (or screenshotWholePage failed for some reason),
+                // so ignore partial updates. also if the tab changed, ignore
+                // partial updates until we do the next whole-page screenshot.
+                return;
+            }
+            mDirtyRect.top = Math.max(mPageRect.top, Math.min(top, mDirtyRect.top));
+            mDirtyRect.left = Math.max(mPageRect.left, Math.min(left, mDirtyRect.left));
+            mDirtyRect.bottom = Math.min(mPageRect.bottom, Math.max(bottom, mDirtyRect.bottom));
+            mDirtyRect.right = Math.min(mPageRect.right, Math.max(right, mDirtyRect.right));
+            if (!mIsRepaintRunnablePosted) {
+                GeckoAppShell.getHandler().postDelayed(this, 5000);
+                mIsRepaintRunnablePosted = true;
             }
         }
     }
 
-    static void sendNextEventToGecko() {
-        synchronized(sPendingScreenshots) {
-            if (sPendingScreenshots.isEmpty())
-                return;
-            GeckoAppShell.sendEventToGecko(sPendingScreenshots.element().getEvent());
-        }
-    }
-    
-    static class PendingScreenshot {
-        private final GeckoEvent mEvent;
-        private final int mTabId;
-
-        PendingScreenshot(int tabId, GeckoEvent event) {
-            mTabId = tabId;
-            mEvent = event;
-        }
-
-        GeckoEvent getEvent() {
-            return mEvent;
-        }
-
+    private void clearDirtyRect() {
+        mDirtyRect.set(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY,
+                       Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY);
     }
 
-    public static void notifyScreenShot(final ByteBuffer data, final int tabId, 
+    public void run() {
+        // make a copy of the dirty rect to work with so we can keep
+        // accumulating new dirty rects.
+        RectF dirtyRect = new RectF();
+        synchronized (this) {
+            dirtyRect.set(mDirtyRect);
+            clearDirtyRect();
+            mIsRepaintRunnablePosted = false;
+        }
+
+        if (dirtyRect.width() <= 0 || dirtyRect.height() <= 0) {
+            // we have nothing in the dirty rect, so nothing to do
+            return;
+        }
+
+        Tab selectedTab = Tabs.getInstance().getSelectedTab();
+        if (selectedTab == null || selectedTab.getId() != mTabId) {
+            // tab changed, so bail out before we start screenshotting
+            // the wrong tab. note we must do this *after* resetting
+            // mIsRepaintRunnablePosted above.
+            return;
+        }
+
+        LayerController layerController = GeckoApp.mAppContext.getLayerController();
+        if (layerController == null) {
+            // we could be in the midst of an activity tear-down and re-start, so guard
+            // against a null layer controller.
+            return;
+        }
+
+        ImmutableViewportMetrics viewport = layerController.getViewportMetrics();
+        if (RectUtils.fuzzyEquals(mPageRect, viewport.getCssPageRect())) {
+            // the page size hasn't changed, so our dirty rect is still valid and we can just
+            // repaint that area
+            int dstx = (int)(mWidthRatio * (dirtyRect.left - viewport.cssPageRectLeft));
+            int dsty = (int)(mHeightRatio * (dirtyRect.top - viewport.cssPageRectTop));
+            int dstw = (int)(mWidthRatio * dirtyRect.width());
+            int dsth = (int)(mHeightRatio * dirtyRect.height());
+            scheduleCheckerboardScreenshotEvent(dirtyRect, dstx, dsty, dstw, dsth);
+        } else {
+            // the page size changed, so we need to re-screenshot the whole page
+            screenshotWholePage(mTabId);
+        }
+    }
+
+    private void scheduleCheckerboardScreenshotEvent(RectF srcRect, int dstx, int dsty, int dstw, int dsth) {
+        int numSlices = (int)FloatMath.ceil(srcRect.width() * srcRect.height() / MAX_PIXELS_PER_SLICE);
+        if (numSlices == 0 || dstw == 0 || dsth == 0) {
+            return;
+        }
+
+        PendingScreenshot pending = new PendingScreenshot(mTabId);
+        int sliceDstH = Math.max(1, dsth / numSlices);
+        float sliceSrcH = sliceDstH * srcRect.height() / dsth;
+        float srcY = srcRect.top;
+        for (int i = 0; i < dsth; i += sliceDstH) {
+            if (i + sliceDstH > dsth) {
+                // the last slice may be smaller to account for rounding error.
+                sliceDstH = dsth - i;
+                sliceSrcH = sliceDstH * srcRect.height() / dsth;
+            }
+            GeckoEvent event = GeckoEvent.createScreenshotEvent(mTabId,
+                (int)srcRect.left, (int)srcY, (int)srcRect.width(), (int)sliceSrcH,
+                dstx, dsty + i, dstw, sliceDstH,
+                mBufferWidth, mBufferHeight, SCREENSHOT_CHECKERBOARD, mBuffer);
+            srcY += sliceSrcH;
+            pending.addEvent(event);
+        }
+        synchronized (mPendingScreenshots) {
+            mPendingScreenshots.add(pending);
+            if (mPendingScreenshots.size() == 1) {
+                sendNextEventToGecko();
+            }
+        }
+    }
+
+    private void sendNextEventToGecko() {
+        synchronized (mPendingScreenshots) {
+            while (!mPendingScreenshots.isEmpty()) {
+                // some of the pending screenshots may have been discard()ed
+                // so keep looping until we find a real one
+                if (mPendingScreenshots.element().sendNextEventToGecko()) {
+                    break;
+                }
+                mPendingScreenshots.remove();
+            }
+        }
+    }
+
+    public static void notifyScreenShot(final ByteBuffer data, final int tabId,
                                         final int left, final int top,
-                                        final int right, final int bottom, 
+                                        final int right, final int bottom,
                                         final int bufferWidth, final int bufferHeight, final int token) {
-
         GeckoAppShell.getHandler().post(new Runnable() {
             public void run() {
-                final Tab tab = Tabs.getInstance().getTab(tabId);
-                if (tab == null) {
-                    if (token == GeckoAppShell.SCREENSHOT_CHECKERBOARD ||
-                        token == GeckoAppShell.SCREENSHOT_CHECKERBOARD_AND_UPDATE) {
-                        synchronized(sPendingScreenshots) {
-                            sPendingScreenshots.remove();
-                            sendNextEventToGecko();
-                        }
-                    }
-                    return;
-                }
-
                 switch (token) {
-                    case GeckoAppShell.SCREENSHOT_CHECKERBOARD:
+                    case SCREENSHOT_CHECKERBOARD:
                     {
-                        // screenshots are always processed sequentially, with the last one 
-                        // marked with the SCREENSHOT_CHECKERBOARD_AND_UPDATE token
-                        synchronized (sAcumulatedRect) {
-                            sAcumulatedRect.union(left, top, right, bottom);
+                        ScreenshotHandler handler = getInstance();
+                        if (Tabs.getInstance().getSelectedTab().getId() == tabId) {
+                            PendingScreenshot current;
+                            synchronized (handler.mPendingScreenshots) {
+                                current = handler.mPendingScreenshots.element();
+                                current.slicePainted(left, top, right, bottom);
+                                if (current.sendNextEventToGecko()) {
+                                    break;
+                                }
+                                // this screenshot has all its slices done, so push it out
+                                // to the layer renderer and remove it from the list
+                            }
+                            LayerController layerController = GeckoApp.mAppContext.getLayerController();
+                            if (layerController != null) {
+                                layerController.getView().getRenderer().setCheckerboardBitmap(
+                                    data, bufferWidth, bufferHeight, handler.mPageRect,
+                                    current.getPaintedRegion());
+                            }
                         }
-                        synchronized(sPendingScreenshots) {
-                            sPendingScreenshots.remove();
-                            sendNextEventToGecko();
+                        synchronized (handler.mPendingScreenshots) {
+                            handler.mPendingScreenshots.remove();
+                            handler.sendNextEventToGecko();
                         }
                         break;
                     }
-                    case GeckoAppShell.SCREENSHOT_CHECKERBOARD_AND_UPDATE:
-                    {
-                        final Rect rect;
-                        synchronized (sAcumulatedRect) {
-                            sAcumulatedRect.union(left, top, right, bottom);
-                            rect = new Rect(sAcumulatedRect);
-                            sAcumulatedRect.setEmpty();
-                        }
-                        GeckoApp.mAppContext.getLayerController()
-                            .getView().getRenderer()
-                            .setCheckerboardBitmap(data, bufferWidth, bufferHeight, sCheckerboardPageRect, rect);
-                        synchronized(sPendingScreenshots) {
-                            sPendingScreenshots.remove();
-                            sendNextEventToGecko();
-                        }
-                        break;
-                    }
-                    case GeckoAppShell.SCREENSHOT_THUMBNAIL:
+                    case SCREENSHOT_THUMBNAIL:
                     {
+                        Tab tab = Tabs.getInstance().getTab(tabId);
                         GeckoApp.mAppContext.handleThumbnailData(tab, data);
                         break;
                     }
@@ -2551,4 +2587,40 @@ class ScreenshotHandler {
             }
         });
     }
+
+    static class PendingScreenshot {
+        private final int mTabId;
+        private final LinkedList<GeckoEvent> mEvents;
+        private final Rect mPainted;
+
+        PendingScreenshot(int tabId) {
+            mTabId = tabId;
+            mEvents = new LinkedList<GeckoEvent>();
+            mPainted = new Rect();
+        }
+
+        void addEvent(GeckoEvent event) {
+            mEvents.add(event);
+        }
+
+        boolean sendNextEventToGecko() {
+            if (!mEvents.isEmpty()) {
+                GeckoAppShell.sendEventToGecko(mEvents.remove());
+                return true;
+            }
+            return false;
+        }
+
+        void slicePainted(int left, int top, int right, int bottom) {
+            mPainted.union(left, top, right, bottom);
+        }
+
+        Rect getPaintedRegion() {
+            return mPainted;
+        }
+
+        void discard() {
+            mEvents.clear();
+        }
+    }
 }
diff --git a/mobile/android/base/gfx/IntSize.java b/mobile/android/base/gfx/IntSize.java
index d57be7562a9..8883e574151 100644
--- a/mobile/android/base/gfx/IntSize.java
+++ b/mobile/android/base/gfx/IntSize.java
@@ -5,6 +5,7 @@
 
 package org.mozilla.gecko.gfx;
 
+import android.util.FloatMath;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -62,10 +63,6 @@ public class IntSize {
         return value + 1;
     }
 
-    public static int nextPowerOfTwo(float value) {
-        return nextPowerOfTwo((int) value);
-    }
-
     public IntSize nextPowerOfTwo() {
         return new IntSize(nextPowerOfTwo(width), nextPowerOfTwo(height));
     }
@@ -75,5 +72,19 @@ public class IntSize {
             return false;
         return (value & (value - 1)) == 0;
     }
+
+    public static int largestPowerOfTwoLessThan(float value) {
+        int val = (int)FloatMath.floor(value);
+        if (val <= 0) {
+            throw new IllegalArgumentException("Error: value must be > 0");
+        }
+        // keep dropping the least-significant set bits until only one is left
+        int bestVal = val;
+        while (val != 0) {
+            bestVal = val;
+            val &= (val - 1);
+        }
+        return bestVal;
+    }
 }
 

From 0e69a851fa7161e0061d260d6114e6ced2f91e86 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 18 Jul 2012 11:54:26 -0400
Subject: [PATCH 028/118] Bug 758992 - Make the classes which use the XPCOM
 nsISupports implementation macros final, to avoid the warning about deleting
 using a pointer to a base class with virtual functions and no virtual dtor
 (more xpcom parts); blanket-r=bzbarsky

---
 xpcom/tests/TestSettingsAPI.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xpcom/tests/TestSettingsAPI.cpp b/xpcom/tests/TestSettingsAPI.cpp
index d43f8c8ab4e..dc1593476c0 100644
--- a/xpcom/tests/TestSettingsAPI.cpp
+++ b/xpcom/tests/TestSettingsAPI.cpp
@@ -8,6 +8,7 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsThreadUtils.h"
+#include "mozilla/Attributes.h"
 
 using namespace mozilla;
 
@@ -25,7 +26,7 @@ void _doCheck(bool cond, const char* msg, int line) {
 
 typedef nsresult(*TestFuncPtr)();
 
-class SettingsServiceCallback : public nsISettingsServiceCallback
+class SettingsServiceCallback MOZ_FINAL : public nsISettingsServiceCallback
 {
 public:
   NS_DECL_ISUPPORTS

From 15320ad1adc9727826e3d05e757ad62f73a9cbe1 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 16 Jul 2012 22:28:44 -0400
Subject: [PATCH 029/118] Bug 773100 - Invalidate the frame bounds instead of
 deleting the frame property. r=roc

---
 layout/base/FrameLayerBuilder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 7dd3750825c..9416a9d7436 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2305,7 +2305,7 @@ InternalInvalidateThebesLayersInSubtree(nsIFrame* aFrame)
   if (aFrame->GetStateBits() & NS_FRAME_HAS_CONTAINER_LAYER) {
     // Delete the invalid region to indicate that all Thebes contents
     // need to be invalidated
-    aFrame->Properties().Delete(ThebesLayerInvalidRegionProperty());
+    InvalidateThebesLayerContents(aFrame, aFrame->GetVisualOverflowRectRelativeToSelf());
     foundContainerLayer = true;
   }
 

From 635cf2dfd2c4d17b00527b22db208d74e783f61c Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 18 Jul 2012 12:12:55 -0400
Subject: [PATCH 030/118] Bug 758992 - Make the classes which use the XPCOM
 nsISupports implementation macros final, to avoid the warning about deleting
 using a pointer to a base class with virtual functions and no virtual dtor
 (more toolkit parts); blanket-r=bzbarsky

---
 .../components/autocomplete/nsAutoCompleteSimpleResult.h | 3 ++-
 toolkit/components/commandlines/nsCommandLine.cpp        | 3 ++-
 toolkit/components/ctypes/ctypes.h                       | 3 ++-
 toolkit/components/perf/PerfMeasurement.h                | 3 ++-
 toolkit/components/reflect/reflect.h                     | 3 ++-
 toolkit/components/startup/nsAppStartup.h                | 9 +++++----
 toolkit/components/telemetry/Telemetry.cpp               | 3 ++-
 toolkit/devtools/debugger/nsJSInspector.h                | 3 ++-
 toolkit/system/osxproxy/nsOSXSystemProxySettings.mm      | 3 ++-
 9 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
index 4d67516d098..dbaab577829 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
+++ b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
@@ -12,8 +12,9 @@
 #include "prtypes.h"
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
+#include "mozilla/Attributes.h"
 
-class nsAutoCompleteSimpleResult : public nsIAutoCompleteSimpleResult
+class nsAutoCompleteSimpleResult MOZ_FINAL : public nsIAutoCompleteSimpleResult
 {
 public:
   nsAutoCompleteSimpleResult();
diff --git a/toolkit/components/commandlines/nsCommandLine.cpp b/toolkit/components/commandlines/nsCommandLine.cpp
index 816b710907b..5e9e08aef9a 100644
--- a/toolkit/components/commandlines/nsCommandLine.cpp
+++ b/toolkit/components/commandlines/nsCommandLine.cpp
@@ -24,6 +24,7 @@
 #include "nsTextFormatter.h"
 #include "nsXPCOMCID.h"
 #include "plstr.h"
+#include "mozilla/Attributes.h"
 
 #ifdef MOZ_WIDGET_COCOA
 #include <CoreFoundation/CoreFoundation.h>
@@ -44,7 +45,7 @@
 #define NS_COMMANDLINE_CID \
   { 0x23bcc750, 0xdc20, 0x460b, { 0xb2, 0xd4, 0x74, 0xd8, 0xf5, 0x8d, 0x36, 0x15 } }
 
-class nsCommandLine : public nsICommandLineRunner
+class nsCommandLine MOZ_FINAL : public nsICommandLineRunner
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/toolkit/components/ctypes/ctypes.h b/toolkit/components/ctypes/ctypes.h
index c0b7d4a8b7a..f02902bc411 100644
--- a/toolkit/components/ctypes/ctypes.h
+++ b/toolkit/components/ctypes/ctypes.h
@@ -7,11 +7,12 @@
 #define COMPONENTS_CTYPES_H
 
 #include "nsIXPCScriptable.h"
+#include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace ctypes {
 
-class Module : public nsIXPCScriptable
+class Module MOZ_FINAL : public nsIXPCScriptable
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/toolkit/components/perf/PerfMeasurement.h b/toolkit/components/perf/PerfMeasurement.h
index 659ea1ad18b..a3230f7f0c7 100644
--- a/toolkit/components/perf/PerfMeasurement.h
+++ b/toolkit/components/perf/PerfMeasurement.h
@@ -7,11 +7,12 @@
 #define COMPONENTS_PERFMEASUREMENT_H
 
 #include "nsIXPCScriptable.h"
+#include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace jsperf {
 
-class Module : public nsIXPCScriptable
+class Module MOZ_FINAL : public nsIXPCScriptable
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/toolkit/components/reflect/reflect.h b/toolkit/components/reflect/reflect.h
index 181dc6bee52..8666444601b 100644
--- a/toolkit/components/reflect/reflect.h
+++ b/toolkit/components/reflect/reflect.h
@@ -7,11 +7,12 @@
 #define COMPONENTS_REFLECT_H
 
 #include "nsIXPCScriptable.h"
+#include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace reflect {
 
-class Module : public nsIXPCScriptable
+class Module MOZ_FINAL : public nsIXPCScriptable
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/toolkit/components/startup/nsAppStartup.h b/toolkit/components/startup/nsAppStartup.h
index 2f4d2c0873d..200f9834d34 100644
--- a/toolkit/components/startup/nsAppStartup.h
+++ b/toolkit/components/startup/nsAppStartup.h
@@ -13,6 +13,7 @@
 
 #include "nsINativeAppSupport.h"
 #include "nsIAppShell.h"
+#include "mozilla/Attributes.h"
 
 #if defined(XP_WIN)
 //XPerf-backed probes
@@ -28,10 +29,10 @@ struct PLEvent;
 { 0x7dd4d320, 0xc84b, 0x4624, { 0x8d, 0x45, 0x7b, 0xb9, 0xb2, 0x35, 0x69, 0x77 } }
 
 
-class nsAppStartup : public nsIAppStartup,
-                     public nsIWindowCreator2,
-                     public nsIObserver,
-                     public nsSupportsWeakReference
+class nsAppStartup MOZ_FINAL : public nsIAppStartup,
+                               public nsIWindowCreator2,
+                               public nsIObserver,
+                               public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 2ea7a3f04f4..4ebe735184c 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -25,6 +25,7 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/FileUtils.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/Attributes.h"
 
 namespace {
 
@@ -85,7 +86,7 @@ AutoHashtable<EntryType>::ReflectIntoJS(ReflectEntryFunc entryFunc,
   return num == this->Count();
 }
 
-class TelemetryImpl : public nsITelemetry
+class TelemetryImpl MOZ_FINAL : public nsITelemetry
 {
   NS_DECL_ISUPPORTS
   NS_DECL_NSITELEMETRY
diff --git a/toolkit/devtools/debugger/nsJSInspector.h b/toolkit/devtools/debugger/nsJSInspector.h
index f0d5e2daab1..cb2265721de 100644
--- a/toolkit/devtools/debugger/nsJSInspector.h
+++ b/toolkit/devtools/debugger/nsJSInspector.h
@@ -7,11 +7,12 @@
 #define COMPONENTS_JSINSPECTOR_H
 
 #include "nsIJSInspector.h"
+#include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace jsinspector {
 
-class nsJSInspector : public nsIJSInspector
+class nsJSInspector MOZ_FINAL : public nsIJSInspector
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
index 102201828cb..ef4553f89d3 100644
--- a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
+++ b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm
@@ -15,8 +15,9 @@
 #include "nsISupportsPrimitives.h"
 #include "nsIURI.h"
 #include "nsObjCExceptions.h"
+#include "mozilla/Attributes.h"
 
-class nsOSXSystemProxySettings : public nsISystemProxySettings {
+class nsOSXSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISYSTEMPROXYSETTINGS

From 59619ba083392dd0e38dc239238b2896aef7f699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Wed, 18 Jul 2012 12:15:47 -0400
Subject: [PATCH 031/118] Bug 775134 - Remove extra ; r=ehsan.

--HG--
extra : rebase_source : 1d44663679e8f1944649d54608e5e6e6694e88c5
---
 content/media/nsMediaDecoder.h |  2 +-
 gfx/layers/ipc/ShadowLayers.h  |  4 ++--
 js/src/jsfriendapi.h           | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/media/nsMediaDecoder.h b/content/media/nsMediaDecoder.h
index bbd697aed68..2c747fc8d97 100644
--- a/content/media/nsMediaDecoder.h
+++ b/content/media/nsMediaDecoder.h
@@ -341,7 +341,7 @@ public:
 
   // Returns the current size of the framebuffer used in
   // MozAudioAvailable events.
-  PRUint32 GetFrameBufferLength() { return mFrameBufferLength; };
+  PRUint32 GetFrameBufferLength() { return mFrameBufferLength; }
 
   // Sets the length of the framebuffer used in MozAudioAvailable events.
   // The new size must be between 512 and 16384.
diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
index ab121ef3412..77aefb8728c 100644
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -464,7 +464,7 @@ public:
   virtual void DestroySharedSurface(gfxSharedImageSurface* aSurface) = 0;
   virtual void DestroySharedSurface(SurfaceDescriptor* aSurface) = 0;
 protected:
-  ~ISurfaceDeAllocator() {};
+  ~ISurfaceDeAllocator() {}
 };
 
 /**
@@ -491,7 +491,7 @@ public:
     mAllocator = aAllocator;
   }
 
-  virtual void DestroyFrontBuffer() { };
+  virtual void DestroyFrontBuffer() { }
 
   /**
    * The following methods are
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index abde7157435..c3213556725 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -828,33 +828,33 @@ struct CompartmentFilter {
 };
 
 struct AllCompartments : public CompartmentFilter {
-    virtual bool match(JSCompartment *c) const { return true; };
+    virtual bool match(JSCompartment *c) const { return true; }
 };
 
 struct ContentCompartmentsOnly : public CompartmentFilter {
     virtual bool match(JSCompartment *c) const {
         return !IsSystemCompartment(c);
-    };
+    }
 };
 
 struct ChromeCompartmentsOnly : public CompartmentFilter {
     virtual bool match(JSCompartment *c) const {
         return IsSystemCompartment(c);
-    };
+    }
 };
 
 struct SingleCompartment : public CompartmentFilter {
     JSCompartment *ours;
-    SingleCompartment(JSCompartment *c) : ours(c) {};
-    virtual bool match(JSCompartment *c) const { return c == ours; };
+    SingleCompartment(JSCompartment *c) : ours(c) {}
+    virtual bool match(JSCompartment *c) const { return c == ours; }
 };
 
 struct CompartmentsWithPrincipals : public CompartmentFilter {
     JSPrincipals *principals;
-    CompartmentsWithPrincipals(JSPrincipals *p) : principals(p) {};
+    CompartmentsWithPrincipals(JSPrincipals *p) : principals(p) {}
     virtual bool match(JSCompartment *c) const {
         return JS_GetCompartmentPrincipals(c) == principals;
-    };
+    }
 };
 
 extern JS_FRIEND_API(JSBool)

From b2f5ade5901c4f7bf2e9d1c7939e5c88dd8400fa Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 18 Jul 2012 12:19:20 -0400
Subject: [PATCH 032/118] Backout changeset f0be368bb172 (bug 773100) for
 broken builds across the board

---
 layout/base/FrameLayerBuilder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 9416a9d7436..7dd3750825c 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2305,7 +2305,7 @@ InternalInvalidateThebesLayersInSubtree(nsIFrame* aFrame)
   if (aFrame->GetStateBits() & NS_FRAME_HAS_CONTAINER_LAYER) {
     // Delete the invalid region to indicate that all Thebes contents
     // need to be invalidated
-    InvalidateThebesLayerContents(aFrame, aFrame->GetVisualOverflowRectRelativeToSelf());
+    aFrame->Properties().Delete(ThebesLayerInvalidRegionProperty());
     foundContainerLayer = true;
   }
 

From 9c51de9d9b5a3a2132647a5f6e889fa9120ae6e4 Mon Sep 17 00:00:00 2001
From: Saurabh Anand <saurabhanandiit@gmail.com>
Date: Wed, 18 Jul 2012 20:48:11 +0530
Subject: [PATCH 033/118] Bug 774660 - openPreferences should consistently not
 return a window object; r=dao

---
 browser/base/content/utilityOverlay.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 5acbc737b47..77523cc0389 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -473,7 +473,7 @@ function openAboutDialog() {
 
 function openPreferences(paneID, extraArgs)
 {
-  if (Services.prefs.getBoolPref("browser.preferences.inContent")) {  
+  if (Services.prefs.getBoolPref("browser.preferences.inContent")) {
     openUILinkIn("about:preferences", "tab");
   } else {
     var instantApply = getBoolPref("browser.preferences.instantApply", false);
@@ -492,17 +492,17 @@ function openPreferences(paneID, extraArgs)
         advancedPaneTabs.selectedTab = win.document.getElementById(extraArgs["advancedTab"]);
       }
 
-     return win;
+     return;
     }
 
-    return openDialog("chrome://browser/content/preferences/preferences.xul",
-                      "Preferences", features, paneID, extraArgs);
+    openDialog("chrome://browser/content/preferences/preferences.xul",
+               "Preferences", features, paneID, extraArgs);
   }
 }
 
 function openAdvancedPreferences(tabID)
 {
-  return openPreferences("paneAdvanced", { "advancedTab" : tabID });
+  openPreferences("paneAdvanced", { "advancedTab" : tabID });
 }
 
 /**

From befea41a2d33df1b2f27a15d745682f4b0661691 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 18 Jul 2012 12:50:10 -0400
Subject: [PATCH 034/118] Bug 770629 (Divs aren't rendered when using CSS 3D
 transforms) regression test for DLBI. r=mattwoodrow.

--HG--
extra : rebase_source : 7f3a2e56e99e56131852babca3405d957aca0593
---
 .../perspective-origin-4-ref.html             | 20 +++++++++++++
 .../transform-3d/perspective-origin-4a.html   | 29 +++++++++++++++++++
 layout/reftests/transform-3d/reftest.list     |  1 +
 3 files changed, 50 insertions(+)
 create mode 100644 layout/reftests/transform-3d/perspective-origin-4-ref.html
 create mode 100644 layout/reftests/transform-3d/perspective-origin-4a.html

diff --git a/layout/reftests/transform-3d/perspective-origin-4-ref.html b/layout/reftests/transform-3d/perspective-origin-4-ref.html
new file mode 100644
index 00000000000..087e572b793
--- /dev/null
+++ b/layout/reftests/transform-3d/perspective-origin-4-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <title>Testcase for bug 770629</title>
+  <style>
+
+div {
+  position: absolute;
+  left: 125px;
+  width: 50px;
+  height: 100px;
+  background: blue;
+}
+
+  </style>
+</head>
+<body>
+  <div></div>
+</body>
+</html>
diff --git a/layout/reftests/transform-3d/perspective-origin-4a.html b/layout/reftests/transform-3d/perspective-origin-4a.html
new file mode 100644
index 00000000000..800756ebb1b
--- /dev/null
+++ b/layout/reftests/transform-3d/perspective-origin-4a.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <title>Testcase for bug 770629</title>
+  <style>
+
+.outer {
+  position: absolute;
+  left: 100px;
+  -moz-transform: scale(0.5,1);
+  -moz-perspective: 200px; 
+  -moz-perspective-origin: 50% 0px;
+}
+
+.inner {
+  width: 100px;
+  height: 100px;
+  background: blue;
+  -moz-transform: rotateY(0deg);
+}
+
+  </style>
+</head>
+<body>
+  <div class="outer"> 
+    <div class="inner"></div> 
+  </div>
+</body>
+</html>
diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
index 519af07495d..b1e93499ccb 100644
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -39,6 +39,7 @@ fuzzy-if(d2d&&layersGPUAccelerated,52,680) fails-if(Android) == scale3d-all-sepa
 == perspective-origin-1b.html perspective-origin-1a.html
 random-if(Android&&!browserIsRemote) == perspective-origin-2a.html perspective-origin-2-ref.html # bug 732568
 == perspective-origin-3a.html perspective-origin-3-ref.html
+== perspective-origin-4a.html perspective-origin-4-ref.html
 != sorting-1a.html sorting-1-ref.html
 # Parallel planes, different z depth
 == sorting-2a.html sorting-2-ref.html

From 1f4a0c4022d8264cfcabb287397077bf426761ed Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Wed, 18 Jul 2012 10:11:26 -0700
Subject: [PATCH 035/118] Bug 774072 - Close Favicons on background thread.
 r=mfinkle

---
 mobile/android/base/GeckoApp.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 3ccf83d0290..a35c58f5380 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -2347,8 +2347,12 @@ abstract public class GeckoApp
         if (mPromptService != null)
             mPromptService.destroy();
 
-        if (mFavicons != null)
-            mFavicons.close();
+        GeckoAppShell.getHandler().post(new Runnable() {
+            public void run() {
+                if (mFavicons != null)
+                    mFavicons.close();
+            }
+        });
 
         if (SmsManager.getInstance() != null) {
             SmsManager.getInstance().stop();

From 81430d16581e1ea5a71266a060ff07d804bd2419 Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Wed, 18 Jul 2012 10:11:26 -0700
Subject: [PATCH 036/118] Bug 774648 - Enable positive button in
 MultiChoicePreference only if items are checked. r=mfinkle

---
 mobile/android/base/MultiChoicePreference.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mobile/android/base/MultiChoicePreference.java b/mobile/android/base/MultiChoicePreference.java
index a2add8183f2..60d953de400 100644
--- a/mobile/android/base/MultiChoicePreference.java
+++ b/mobile/android/base/MultiChoicePreference.java
@@ -5,6 +5,7 @@
 
 package org.mozilla.gecko;
 
+import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.content.res.TypedArray;
 import android.content.Context;
@@ -12,6 +13,7 @@ import android.content.DialogInterface;
 import android.preference.DialogPreference;
 import android.preference.PreferenceManager;
 import android.util.AttributeSet;
+import android.widget.Button;
 
 class MultiChoicePreference extends DialogPreference {
     private static final String LOGTAG = "GeckoMultiChoicePreference";
@@ -149,6 +151,18 @@ class MultiChoicePreference extends DialogPreference {
         builder.setMultiChoiceItems(mEntries, mValues, new DialogInterface.OnMultiChoiceClickListener() {
             public void onClick(DialogInterface dialog, int which, boolean val) {
                 // mValues is automatically updated when checkboxes are clicked
+
+                // enable positive button only if at least one item is checked
+                boolean enabled = false;
+                for (int i = 0; i < mValues.length; i++) {
+                    if (mValues[i]) {
+                        enabled = true;
+                        break;
+                    }
+                }
+                Button button = ((AlertDialog) dialog).getButton(DialogInterface.BUTTON_POSITIVE);
+                if (button.isEnabled() != enabled)
+                    button.setEnabled(enabled);
             }
         });
     }

From 8dd15b673297f9892203f7d67fc56c8897b1c5f9 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 18 Jul 2012 08:24:01 -0700
Subject: [PATCH 037/118] Bug 774819 - Handle system principals in
 nsPermissionManager when taking principals. r=sicking

---
 extensions/cookie/nsPermissionManager.cpp    | 26 ++++++++++++++++++++
 netwerk/base/public/nsIPermissionManager.idl |  6 +++++
 2 files changed, 32 insertions(+)

diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
index c3392707561..05090f6915b 100644
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -22,6 +22,7 @@
 #include "mozilla/Attributes.h"
 #include "nsXULAppAPI.h"
 #include "nsIPrincipal.h"
+#include "nsContentUtils.h"
 
 static nsPermissionManager *gPermissionManager = nsnull;
 
@@ -511,6 +512,12 @@ nsPermissionManager::AddFromPrincipal(nsIPrincipal* aPrincipal,
 {
   NS_ENSURE_ARG_POINTER(aPrincipal);
 
+  // We don't add the system principal because it actually has no URI and we
+  // always allow action for them.
+  if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIURI> uri;
   aPrincipal->GetURI(getter_AddRefs(uri));
 
@@ -701,6 +708,11 @@ nsPermissionManager::RemoveFromPrincipal(nsIPrincipal* aPrincipal,
 {
   NS_ENSURE_ARG_POINTER(aPrincipal);
 
+  // System principals are never added to the database, no need to remove them.
+  if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIURI> uri;
   aPrincipal->GetURI(getter_AddRefs(uri));
   NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE);
@@ -790,6 +802,13 @@ nsPermissionManager::TestPermissionFromPrincipal(nsIPrincipal* aPrincipal,
 {
   NS_ENSURE_ARG_POINTER(aPrincipal);
 
+  // System principals do not have URI so we can't try to get
+  // retro-compatibility here.
+  if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
+    *aPermission = nsIPermissionManager::ALLOW_ACTION;
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIURI> uri;
   aPrincipal->GetURI(getter_AddRefs(uri));
 
@@ -803,6 +822,13 @@ nsPermissionManager::TestExactPermissionFromPrincipal(nsIPrincipal* aPrincipal,
 {
   NS_ENSURE_ARG_POINTER(aPrincipal);
 
+  // System principals do not have URI so we can't try to get
+  // retro-compatibility here.
+  if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
+    *aPermission = nsIPermissionManager::ALLOW_ACTION;
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIURI> uri;
   aPrincipal->GetURI(getter_AddRefs(uri));
 
diff --git a/netwerk/base/public/nsIPermissionManager.idl b/netwerk/base/public/nsIPermissionManager.idl
index d042183e359..2a2aaad2542 100644
--- a/netwerk/base/public/nsIPermissionManager.idl
+++ b/netwerk/base/public/nsIPermissionManager.idl
@@ -93,6 +93,8 @@ interface nsIPermissionManager : nsISupports
    * Add permission information for a given principal.
    * It is internally calling the other add() method using the nsIURI from the
    * principal.
+   * Passing a system principal will be a no-op because they will always be
+   * granted permissions.
    */
   void addFromPrincipal(in nsIPrincipal principal, in string typed,
                         in PRUint32 permission,
@@ -116,6 +118,8 @@ interface nsIPermissionManager : nsISupports
   /**
    * Remove permission information for a given principal.
    * This is internally calling remove() with the host from the principal's URI.
+   * Passing system principal will be a no-op because we never add them to the
+   * database.
    */
   void removeFromPrincipal(in nsIPrincipal principal, in string type);
 
@@ -136,6 +140,7 @@ interface nsIPermissionManager : nsISupports
 
   /**
    * Test whether the principal has the permission to perform a given action.
+   * System principals will always have permissions granted.
    */
   PRUint32 testPermissionFromPrincipal(in nsIPrincipal principal,
                                        in string type);
@@ -153,6 +158,7 @@ interface nsIPermissionManager : nsISupports
 
   /**
    * See testExactPermission() above.
+   * System principals will always have permissions granted.
    */
   PRUint32 testExactPermissionFromPrincipal(in nsIPrincipal principal,
                                             in string type);

From 16d7f620e4ee3e38c6e57ca41bd3dc9b5d170cb8 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 9 Jul 2012 13:40:07 -0400
Subject: [PATCH 038/118] Bug 763524 - part 1: pass the entire ping to doPing;
 r=taras

---
 toolkit/components/telemetry/TelemetryPing.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index 618484c2461..48c9b8a32fb 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -538,12 +538,12 @@ TelemetryPing.prototype = {
       // Notify that testing is complete, even if we didn't send everything.
       finishPings(reason);
     }
-    this.doPing(server, data.slug, data.payload,
+    this.doPing(server, data,
                 onSuccess.bind(this), onError.bind(this));
   },
 
-  doPing: function doPing(server, slug, payload, onSuccess, onError) {
-    let submitPath = "/submit/telemetry/" + slug;
+  doPing: function doPing(server, ping, onSuccess, onError) {
+    let submitPath = "/submit/telemetry/" + ping.slug;
     let url = server + submitPath;
     let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
                   .createInstance(Ci.nsIXMLHttpRequest);
@@ -576,7 +576,7 @@ TelemetryPing.prototype = {
     request.setRequestHeader("Content-Encoding", "gzip");
     let payloadStream = Cc["@mozilla.org/io/string-input-stream;1"]
                         .createInstance(Ci.nsIStringInputStream);
-    payloadStream.data = this.gzipCompressString(payload);
+    payloadStream.data = this.gzipCompressString(ping.payload);
     request.send(payloadStream);
   },
 

From 7a7b0d256810c9239fd34b27f5acd58ffa1222a4 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 10 Jul 2012 10:17:10 -0400
Subject: [PATCH 039/118] Bug 763524 - part 2: separate out finishRequest and
 rename it; r=taras

---
 toolkit/components/telemetry/TelemetryPing.js | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index 48c9b8a32fb..9a9ba6bc643 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -542,6 +542,22 @@ TelemetryPing.prototype = {
                 onSuccess.bind(this), onError.bind(this));
   },
 
+  finishPingRequest: function finishPingRequest(success, startTime) {
+    let hping = Telemetry.getHistogramById("TELEMETRY_PING");
+    let hsuccess = Telemetry.getHistogramById("TELEMETRY_SUCCESS");
+
+    hsuccess.add(success);
+    hping.add(new Date() - startTime);
+
+    if (success) {
+      let file = this.savedHistogramsFile();
+      try {
+        file.remove(true);
+      } catch(e) {
+      }
+    }
+  },
+
   doPing: function doPing(server, ping, onSuccess, onError) {
     let submitPath = "/submit/telemetry/" + ping.slug;
     let url = server + submitPath;
@@ -553,25 +569,15 @@ TelemetryPing.prototype = {
     request.setRequestHeader("Content-Type", "application/json; charset=UTF-8");
 
     let startTime = new Date();
-    let file = this.savedHistogramsFile();
-
-    function finishRequest(success) {
-      let hping = Telemetry.getHistogramById("TELEMETRY_PING");
-      let hsuccess = Telemetry.getHistogramById("TELEMETRY_SUCCESS");
-
-      hsuccess.add(success);
-      hping.add(new Date() - startTime);
-
-      if (success && file.exists()) {
-        file.remove(true);
-      }
-    }
 
     function handler(success, callback) {
-      return function(event) { finishRequest(success); callback() };
+      return function(event) {
+        this.finishPingRequest(success, startTime);
+        callback();
+      };
     }
-    request.addEventListener("error", handler(false, onError), false);
-    request.addEventListener("load", handler(true, onSuccess), false);
+    request.addEventListener("error", handler(false, onError).bind(this), false);
+    request.addEventListener("load", handler(true, onSuccess).bind(this), false);
 
     request.setRequestHeader("Content-Encoding", "gzip");
     let payloadStream = Cc["@mozilla.org/io/string-input-stream;1"]

From d1ed121ea672b7708fd6fc20999d897218693841 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 10 Jul 2012 10:18:48 -0400
Subject: [PATCH 040/118] Bug 763524 - part 3: persist each ping to its own
 unique file; r=taras

---
 toolkit/components/telemetry/TelemetryPing.js | 122 +++++++++++++++---
 1 file changed, 103 insertions(+), 19 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index 9a9ba6bc643..4a690091c71 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -188,6 +188,12 @@ TelemetryPing.prototype = {
   _hasWindowRestoredObserver: false,
   _pendingPings: [],
   _doLoadSaveNotifications: false,
+  _hashID: Ci.nsICryptoHash.SHA256,
+  // The number of outstanding saved pings that we have issued loading
+  // requests for.
+  _pingsLoaded: 0,
+  // The number of those requests that have actually completed.
+  _pingLoadsCompleted: 0,
 
   /**
    * When reflecting a histogram into JS, Telemetry hands us an object
@@ -495,6 +501,17 @@ TelemetryPing.prototype = {
     return { __iterator__: payloadIterWithThis };
   },
 
+  hashString: function hashString(s) {
+    let digest = Cc["@mozilla.org/security/hash;1"]
+                 .createInstance(Ci.nsICryptoHash);
+    digest.init(this._hashID);
+    let stream = Cc["@mozilla.org/io/string-input-stream;1"]
+                 .createInstance(Ci.nsIStringInputStream);
+    stream.data = s;
+    digest.updateFromStream(stream, stream.available());
+    return digest.finish(/*base64encode=*/true);
+  },
+
   /**
    * Send data to the server. Record success/send-time in histograms
    */
@@ -542,7 +559,7 @@ TelemetryPing.prototype = {
                 onSuccess.bind(this), onError.bind(this));
   },
 
-  finishPingRequest: function finishPingRequest(success, startTime) {
+  finishPingRequest: function finishPingRequest(success, startTime, ping) {
     let hping = Telemetry.getHistogramById("TELEMETRY_PING");
     let hsuccess = Telemetry.getHistogramById("TELEMETRY_SUCCESS");
 
@@ -550,7 +567,7 @@ TelemetryPing.prototype = {
     hping.add(new Date() - startTime);
 
     if (success) {
-      let file = this.savedHistogramsFile();
+      let file = this.saveFileForPing(ping);
       try {
         file.remove(true);
       } catch(e) {
@@ -572,7 +589,7 @@ TelemetryPing.prototype = {
 
     function handler(success, callback) {
       return function(event) {
-        this.finishPingRequest(success, startTime);
+        this.finishPingRequest(success, startTime, ping);
         callback();
       };
     }
@@ -628,14 +645,6 @@ TelemetryPing.prototype = {
     }
   },
 
-  savedHistogramsFile: function savedHistogramsFile() {
-    let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
-    let profileFile = profileDirectory.clone();
-    let name = "savedTelemetry.dat.json";
-    profileFile.append(name);
-    return profileFile;
-  },
-
   /**
    * Initializes telemetry within a timer. If there is no PREF_SERVER set, don't turn on telemetry.
    */
@@ -671,16 +680,32 @@ TelemetryPing.prototype = {
     }
     this._timer.initWithCallback(timerCallback.bind(this), TELEMETRY_DELAY,
                                  Ci.nsITimer.TYPE_ONE_SHOT);
-    this.loadHistograms(this.savedHistogramsFile(), false);
+    this.loadSavedPings(false);
+  },
+
+  verifyPingChecksum: function verifyPingChecksum(ping) {
+    /* A ping from the current session won't have a checksum.  */
+    if (!ping.checksum) {
+      return true;
+    }
+
+    let checksumNow = this.hashString(ping.payload);
+    return ping.checksum == checksumNow;
   },
 
   addToPendingPings: function addToPendingPings(stream) {
     try {
       let string = NetUtil.readInputStreamToString(stream, stream.available(), { charset: "UTF-8" });
       stream.close();
-      let data = JSON.parse(string);
-      this._pendingPings = this._pendingPings.concat(data);
-      if (this._doLoadSaveNotifications) {
+      let ping = JSON.parse(string);
+      this._pingLoadsCompleted++;
+
+      if (this.verifyPingChecksum(ping)) {
+        this._pendingPings.push(ping);
+      }
+
+      if (this._doLoadSaveNotifications &&
+          this._pingLoadsCompleted == this._pingsLoaded) {
         Services.obs.notifyObservers(null, "telemetry-test-load-complete", null);
       }
     } catch (e) {
@@ -689,6 +714,7 @@ TelemetryPing.prototype = {
   },
 
   loadHistograms: function loadHistograms(file, sync) {
+    this._pingsLoaded++;
     if (sync) {
       let stream = Cc["@mozilla.org/network/file-input-stream;1"]
                    .createInstance(Ci.nsIFileInputStream);
@@ -707,6 +733,23 @@ TelemetryPing.prototype = {
     }
   },
 
+  loadSavedPings: function loadSavedPings(sync) {
+    let directory = this.ensurePingDirectory();
+    let entries = directory.directoryEntries
+                           .QueryInterface(Ci.nsIDirectoryEnumerator);
+    this._pingsLoaded = 0;
+    this._pingLoadsCompleted = 0;
+    try {
+      let entry;
+      while (entry = entries.nextFile()) {
+        this.loadHistograms(entry, sync);
+      }
+    }
+    finally {
+      entries.close();
+    }
+  },
+
   finishTelemetrySave: function finishTelemetrySave(ok, stream) {
     stream.QueryInterface(Ci.nsISafeOutputStream).finish();
     stream.close();
@@ -715,9 +758,8 @@ TelemetryPing.prototype = {
     }
   },
 
-  saveHistograms: function saveHistograms(file, sync) {
-    let pings = [this.getCurrentSessionPayloadAndSlug("saved-session")];
-    let pingString = JSON.stringify(pings);
+  savePingToFile: function savePingToFile(ping, file, sync) {
+    let pingString = JSON.stringify(ping);
 
     let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
                     .createInstance(Ci.nsIScriptableUnicodeConverter);
@@ -756,6 +798,46 @@ TelemetryPing.prototype = {
     return null;
   },
 
+  ensurePingDirectory: function ensurePingDirectory() {
+    let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
+    let directory = profileDirectory.clone();
+    directory.append("saved-telemetry-pings");
+    if (directory.exists()) {
+      if (directory.isDirectory()) {
+        return directory;
+      } else {
+        directory.remove(true);
+      }
+    }
+
+    directory.create(Ci.nsIFile.DIRECTORY_TYPE, RW_OWNER);
+    return directory;
+  },
+
+  saveFileForPing: function saveFileForPing(ping) {
+    if (!('checksum' in ping)) {
+      ping.checksum = this.hashString(ping.payload);
+    }
+    let file = this.ensurePingDirectory();
+    file.append(ping.slug);
+    return file;
+  },
+
+  savePing: function savePing(ping) {
+    this.savePingToFile(ping, this.saveFileForPing(ping), true);
+  },
+
+  savePendingPings: function savePendingPings() {
+    this._pendingPings.push(this.getCurrentSessionPayloadAndSlug("saved-session"));
+    this._pendingPings.forEach(function sppcb(e, i, a) { this.savePing(e); }, this);
+    this._pendingPings = [];
+  },
+
+  saveHistograms: function saveHistograms(file, sync) {
+    this.savePingToFile(this.getCurrentSessionPayloadAndSlug("saved-session"),
+                        file, sync);
+  },
+
   /** 
    * Remove observers to avoid leaks
    */
@@ -835,6 +917,8 @@ TelemetryPing.prototype = {
       this.saveHistograms(aSubject.QueryInterface(Ci.nsIFile), aData != "async");
       break;
     case "test-load-histograms":
+      this._pingsLoaded = 0;
+      this._pingLoadsCompleted = 0;
       this.loadHistograms(aSubject.QueryInterface(Ci.nsIFile), aData != "async");
       break;
     case "test-enable-load-save-notifications":
@@ -856,7 +940,7 @@ TelemetryPing.prototype = {
       }
       break;
     case "quit-application-granted":
-      this.saveHistograms(this.savedHistogramsFile(), true);
+      this.savePendingPings();
       break;
     }
   },

From 9cc175018980a64736ab14bc0c606007fc3aba21 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Wed, 18 Jul 2012 16:13:15 +0300
Subject: [PATCH 041/118] Bug 771481 - 'No scripts.' should be displayed in the
 dropdown when there are no scripts matching the search string; r=past

---
 browser/devtools/debugger/debugger-view.js    | 24 +++++++++++---
 browser/devtools/debugger/debugger.xul        |  1 +
 .../browser_dbg_location-changes-blank.js     |  7 +++++
 .../test/browser_dbg_scripts-searching-02.js  | 31 +++++++++++++++++++
 .../chrome/browser/devtools/debugger.dtd      |  2 +-
 .../browser/devtools/debugger.properties      |  8 +++++
 .../themes/gnomestripe/devtools/debugger.css  |  1 +
 .../themes/pinstripe/devtools/debugger.css    |  1 +
 .../themes/winstripe/devtools/debugger.css    |  1 +
 9 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js
index 66cd035e2d6..126712fad8b 100644
--- a/browser/devtools/debugger/debugger-view.js
+++ b/browser/devtools/debugger/debugger-view.js
@@ -149,6 +149,8 @@ ScriptsView.prototype = {
    */
   empty: function DVS_empty() {
     this._scripts.selectedIndex = -1;
+    this._scripts.setAttribute("label", L10N.getStr("noScriptsText"));
+    this._scripts.removeAttribute("tooltiptext");
 
     while (this._scripts.firstChild) {
       this._scripts.removeChild(this._scripts.firstChild);
@@ -425,9 +427,8 @@ ScriptsView.prototype = {
       return;
     }
 
-    let script = selectedItem.getUserData("sourceScript");
-    this._preferredScript = script;
-    DebuggerController.SourceScripts.showScript(script);
+    this._preferredScript = selectedItem;
+    DebuggerController.SourceScripts.showScript(selectedItem.getUserData("sourceScript"));
   },
 
   /**
@@ -438,8 +439,15 @@ ScriptsView.prototype = {
     let scripts = this._scripts;
     let [file, line, token] = this._getSearchboxInfo();
 
+    // If the webpage has no scripts, searching is redundant.
+    if (!scripts.itemCount) {
+      return;
+    }
+
     // Presume we won't find anything.
     scripts.selectedItem = this._preferredScript;
+    scripts.setAttribute("label", this._preferredScript.label);
+    scripts.setAttribute("tooltiptext", this._preferredScript.value);
 
     // If we're not searching for a file anymore, unhide all the scripts.
     if (!file) {
@@ -447,7 +455,9 @@ ScriptsView.prototype = {
         scripts.getItemAtIndex(i).hidden = false;
       }
     } else {
-      for (let i = 0, l = scripts.itemCount, found = false; i < l; i++) {
+      let found = false;
+
+      for (let i = 0, l = scripts.itemCount; i < l; i++) {
         let item = scripts.getItemAtIndex(i);
         let target = item.label.toLowerCase();
 
@@ -458,6 +468,8 @@ ScriptsView.prototype = {
           if (!found) {
             found = true;
             scripts.selectedItem = item;
+            scripts.setAttribute("label", item.label);
+            scripts.setAttribute("tooltiptext", item.value);
           }
         }
         // Hide what doesn't match our search.
@@ -465,6 +477,10 @@ ScriptsView.prototype = {
           item.hidden = true;
         }
       }
+      if (!found) {
+        scripts.setAttribute("label", L10N.getStr("noMatchingScriptsText"));
+        scripts.removeAttribute("tooltiptext");
+      }
     }
     if (line > -1) {
       editor.setCaretPosition(line - 1);
diff --git a/browser/devtools/debugger/debugger.xul b/browser/devtools/debugger/debugger.xul
index e3ddeeeefb0..9c8fc8a0cd5 100644
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -64,6 +64,7 @@
                        tabindex="0"/>
       </hbox>
       <menulist id="scripts" class="devtools-menulist"
+                sizetopopup="always"
                 label="&debuggerUI.emptyScriptText;"/>
       <textbox id="scripts-search" type="search"
                class="devtools-searchinput"
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
index bc5a5501488..0366656a966 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
@@ -67,6 +67,13 @@ function testLocationChange()
           is(gDebugger.editor.getText().length, 0,
             "The source editor not have any text displayed.");
 
+          let menulist = gDebugger.DebuggerView.Scripts._scripts;
+          let noScripts = gDebugger.L10N.getStr("noScriptsText");
+          is(menulist.getAttribute("label"), noScripts,
+            "The menulist should display a notice that there are no scripts availalble.");
+          is(menulist.getAttribute("tooltiptext"), "",
+            "The menulist shouldn't have any tooltip text attributed when there are no scripts available.");
+
           closeDebuggerAndFinish();
         });
       });
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
index a61f6bfbee1..07efb807014 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
@@ -124,10 +124,41 @@ function finalCheck(i, string, token) {
   }
 
   clear();
+  ok(gEditor.getCaretPosition().line == 5 &&
+     gEditor.getCaretPosition().col == 8 + token.length + i,
+    "The editor didn't remain at the correct token. (4)");
 
   executeSoon(function() {
+    let noMatchingScripts = gDebugger.L10N.getStr("noMatchingScriptsText");
+
     is(gScripts.visibleItemsCount, 2,
       "Not all the scripts are shown after the searchbox was emptied.");
+    is(gMenulist.selectedIndex, 1,
+      "The menulist should have retained its selected index after the searchbox was emptied.");
+
+    write("BOGUS");
+    ok(gEditor.getCaretPosition().line == 5 &&
+       gEditor.getCaretPosition().col == 8 + token.length + i,
+      "The editor didn't remain at the correct token. (5)");
+
+    is(gMenulist.getAttribute("label"), noMatchingScripts,
+      "The menulist should display a notice that no scripts match the searched token.");
+    is(gScripts.visibleItemsCount, 0,
+      "No scripts should be displayed in the menulist after a bogus search.");
+    is(gMenulist.selectedIndex, 1,
+      "The menulist should retain its selected index after a bogus search.");
+
+    clear();
+    ok(gEditor.getCaretPosition().line == 5 &&
+       gEditor.getCaretPosition().col == 8 + token.length + i,
+      "The editor didn't remain at the correct token. (6)");
+
+    isnot(gMenulist.getAttribute("label"), noMatchingScripts,
+      "The menulist should not display a notice after the searchbox was emptied.");
+    is(gScripts.visibleItemsCount, 2,
+      "Not all the scripts are shown after the searchbox was emptied.");
+    is(gMenulist.selectedIndex, 1,
+      "The menulist should have retained its selected index after the searchbox was emptied of a bogus search.");
 
     closeDebuggerAndFinish();
   });
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
index 3585f39ce9e..cc3c0a67d7f 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
@@ -67,4 +67,4 @@
 
 <!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
   - there are no scripts. -->
-<!ENTITY debuggerUI.emptyScriptText  "No scripts.">
+<!ENTITY debuggerUI.emptyScriptText  "No scripts">
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.properties b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
index 33c5a72863a..ccabd54a17e 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
@@ -59,6 +59,14 @@ emptyStackText=No stacks to display.
 # breakpoints list when there are no breakpoints to display.
 emptyBreakpointsText=No breakpoints to display.
 
+# LOCALIZATION NOTE (noScriptsText): The text to display in the menulist when
+# there are no scripts.
+noScriptsText=No scripts
+
+# LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
+# menulist when there are no matching scripts after filtering.
+noMatchingScriptsText=No matching scripts
+
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.enableSelf=Enable breakpoint
diff --git a/browser/themes/gnomestripe/devtools/debugger.css b/browser/themes/gnomestripe/devtools/debugger.css
index 8119f0013e9..124d9c3ac55 100644
--- a/browser/themes/gnomestripe/devtools/debugger.css
+++ b/browser/themes/gnomestripe/devtools/debugger.css
@@ -18,6 +18,7 @@
 
 #scripts {
   max-width: 350px;
+  min-width: 150px;
 }
 
 /**
diff --git a/browser/themes/pinstripe/devtools/debugger.css b/browser/themes/pinstripe/devtools/debugger.css
index 43ed914f580..a73eab55503 100644
--- a/browser/themes/pinstripe/devtools/debugger.css
+++ b/browser/themes/pinstripe/devtools/debugger.css
@@ -20,6 +20,7 @@
 
 #scripts {
   max-width: 350px;
+  min-width: 150px;
 }
 
 /**
diff --git a/browser/themes/winstripe/devtools/debugger.css b/browser/themes/winstripe/devtools/debugger.css
index 7628f7ec045..c1c23aab327 100644
--- a/browser/themes/winstripe/devtools/debugger.css
+++ b/browser/themes/winstripe/devtools/debugger.css
@@ -18,6 +18,7 @@
 
 #scripts {
   max-width: 350px;
+  min-width: 150px;
 }
 
 /**

From 74901db492776032da16b7b291a39ef44e3e88b0 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Wed, 18 Jul 2012 09:42:51 +0300
Subject: [PATCH 042/118] Bug 774220 - Script URLs should appear in tooltips
 even when the menu list is not open; r=past

---
 browser/devtools/debugger/debugger-view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js
index 126712fad8b..453ba4f6cd1 100644
--- a/browser/devtools/debugger/debugger-view.js
+++ b/browser/devtools/debugger/debugger-view.js
@@ -428,6 +428,7 @@ ScriptsView.prototype = {
     }
 
     this._preferredScript = selectedItem;
+    this._scripts.setAttribute("tooltiptext", selectedItem.value);
     DebuggerController.SourceScripts.showScript(selectedItem.getUserData("sourceScript"));
   },
 

From 4c30af2c8771a9528a35a378bd7140ed7531c625 Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Fri, 13 Jul 2012 11:32:09 +0200
Subject: [PATCH 043/118] Bug 765564 - [devtb] Add a DevTools menu to the
 developer toolbar. r=dao

---
 browser/base/content/browser-appmenu.inc      | 73 +++--------------
 browser/base/content/browser-menubar.inc      | 82 +++----------------
 browser/base/content/browser-sets.inc         | 81 ++++++++++++++++--
 browser/base/content/browser.css              |  6 ++
 browser/base/content/browser.js               | 77 ++++++-----------
 browser/base/content/browser.xul              | 33 +++++---
 .../locales/en-US/chrome/browser/browser.dtd  |  1 +
 browser/themes/gnomestripe/browser.css        |  9 ++
 browser/themes/pinstripe/browser.css          |  9 ++
 browser/themes/winstripe/browser.css          |  9 ++
 10 files changed, 180 insertions(+), 200 deletions(-)

diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index e7f32cb2545..32c78147db9 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -142,68 +142,19 @@
       <menu id="appmenu_webDeveloper"
             label="&appMenuWebDeveloper.label;">
         <menupopup id="appmenu_webDeveloper_popup">
-          <menuitem id="appmenu_devToolbar"
-                    type="checkbox"
-                    autocheck="false"
-                    hidden="true"
-                    label="&devToolbarMenu.label;"
-                    command="Tools:DevToolbar"
-                    key="key_devToolbar"/>
-          <menuitem id="appmenu_webConsole"
-                    label="&webConsoleCmd.label;"
-                    type="checkbox"
-                    command="Tools:WebConsole"
-                    key="key_webConsole"/>
-          <menuitem id="appmenu_pageInspect"
-                    hidden="true"
-                    label="&inspectMenu.label;"
-                    type="checkbox"
-                    command="Tools:Inspect"
-                    key="key_inspect"/>
-          <menuitem id="appmenu_responsiveUI"
-                    hidden="true"
-                    label="&responsiveDesignTool.label;"
-                    type="checkbox"
-                    command="Tools:ResponsiveUI"
-                    key="key_responsiveUI"/>
-          <menuitem id="appmenu_debugger"
-                    hidden="true"
-                    type="checkbox"
-                    label="&debuggerMenu.label2;"
-                    key="key_debugger"
-                    command="Tools:Debugger"/>
-          <menuitem id="appmenu_remoteDebugger"
-                    hidden="true"
-                    label="&remoteDebuggerMenu.label;"
-                    command="Tools:RemoteDebugger"/>
-          <menuitem id="appmenu_chromeDebugger"
-                    hidden="true"
-                    label="&chromeDebuggerMenu.label;"
-                    command="Tools:ChromeDebugger"/>
-          <menuitem id="appmenu_scratchpad"
-                    hidden="true"
-                    label="&scratchpad.label;"
-                    key="key_scratchpad"
-                    command="Tools:Scratchpad"/>
-          <menuitem id="appmenu_styleeditor"
-                    hidden="true"
-                    type="checkbox"
-                    label="&styleeditor.label;"
-                    key="key_styleeditor"
-                    command="Tools:StyleEditor"/>
-          <menuitem id="appmenu_pageSource"
-                    label="&viewPageSourceCmd.label;"
-                    command="View:PageSource"
-                    key="key_viewSource"/>
-          <menuitem id="appmenu_errorConsole"
-                    hidden="true"
-                    label="&errorConsoleCmd.label;"
-                    key="key_errorConsole"
-                    oncommand="toJavaScriptConsole();"/>
+          <menuitem id="appmenu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar"/>
+          <menuitem id="appmenu_webConsole" observes="devtoolsMenuBroadcaster_WebConsole" />
+          <menuitem id="appmenu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect"/>
+          <menuitem id="appmenu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
+          <menuitem id="appmenu_debugger" observes="devtoolsMenuBroadcaster_Debugger"/>
+          <menuitem id="appmenu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
+          <menuitem id="appmenu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
+          <menuitem id="appmenu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad"/>
+          <menuitem id="appmenu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor"/>
+          <menuitem id="appmenu_pageSource" observes="devtoolsMenuBroadcaster_PageSource"/>
+          <menuitem id="appmenu_errorConsole" observes="devtoolsMenuBroadcaster_ErrorConsole"/>
           <menuseparator id="appmenu_devToolsEndSeparator"/>
-          <menuitem id="appmenu_getMoreDevtools"
-                    label="&getMoreDevtoolsCmd.label;"
-                    oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
+          <menuitem id="appmenu_getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools"/>
           <menuseparator/>
 #define ID_PREFIX appmenu_developer_
 #define OMIT_ACCESSKEYS
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 8dd6a3c2338..f49bba99db3 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -514,77 +514,19 @@
                     label="&webDeveloperMenu.label;"
                     accesskey="&webDeveloperMenu.accesskey;">
                 <menupopup id="menuWebDeveloperPopup">
-                  <menuitem id="menu_devToolbar"
-                            type="checkbox"
-                            autocheck="false"
-                            hidden="true"
-                            label="&devToolbarMenu.label;"
-                            accesskey="&devToolbarMenu.accesskey;"
-                            key="key_devToolbar"
-                            command="Tools:DevToolbar"/>
-                  <menuitem id="webConsole"
-                            type="checkbox"
-                            label="&webConsoleCmd.label;"
-                            accesskey="&webConsoleCmd.accesskey;"
-                            key="key_webConsole"
-                            command="Tools:WebConsole"/>
-                  <menuitem id="menu_pageinspect"
-                            type="checkbox"
-                            hidden="true"
-                            label="&inspectMenu.label;"
-                            accesskey="&inspectMenu.accesskey;"
-                            key="key_inspect"
-                            command="Tools:Inspect"/>
-                  <menuitem id="menu_responsiveUI"
-                            type="checkbox"
-                            hidden="true"
-                            label="&responsiveDesignTool.label;"
-                            accesskey="&responsiveDesignTool.accesskey;"
-                            key="key_responsiveUI"
-                            command="Tools:ResponsiveUI"/>
-                  <menuitem id="menu_debugger"
-                            hidden="true"
-                            type="checkbox"
-                            label="&debuggerMenu.label2;"
-                            key="key_debugger"
-                            command="Tools:Debugger"/>
-                  <menuitem id="menu_remoteDebugger"
-                            hidden="true"
-                            label="&remoteDebuggerMenu.label;"
-                            command="Tools:RemoteDebugger"/>
-                  <menuitem id="menu_chromeDebugger"
-                            hidden="true"
-                            label="&chromeDebuggerMenu.label;"
-                            command="Tools:ChromeDebugger"/>
-                  <menuitem id="menu_scratchpad"
-                            hidden="true"
-                            label="&scratchpad.label;"
-                            accesskey="&scratchpad.accesskey;"
-                            key="key_scratchpad"
-                            command="Tools:Scratchpad"/>
-                  <menuitem id="menu_styleeditor"
-                            type="checkbox"
-                            hidden="true"
-                            label="&styleeditor.label;"
-                            accesskey="&styleeditor.accesskey;"
-                            key="key_styleeditor"
-                            command="Tools:StyleEditor"/>
-                  <menuitem id="menu_pageSource"
-                            accesskey="&pageSourceCmd.accesskey;"
-                            label="&pageSourceCmd.label;"
-                            key="key_viewSource"
-                            command="View:PageSource"/>
-                  <menuitem id="javascriptConsole"
-                            hidden="true"
-                            label="&errorConsoleCmd.label;"
-                            accesskey="&errorConsoleCmd.accesskey;"
-                            key="key_errorConsole"
-                            oncommand="toJavaScriptConsole();"/>
+                  <menuitem id="menu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar" accesskey="&devToolbarMenu.accesskey;"/>
+                  <menuitem id="webConsole" observes="devtoolsMenuBroadcaster_WebConsole" accesskey="&webConsoleCmd.accesskey;"/>
+                  <menuitem id="menu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect" accesskey="&inspectMenu.accesskey;"/>
+                  <menuitem id="menu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI" accesskey="&responsiveDesignTool.accesskey;"/>
+                  <menuitem id="menu_debugger" observes="devtoolsMenuBroadcaster_Debugger"/>
+                  <menuitem id="menu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
+                  <menuitem id="menu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
+                  <menuitem id="menu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad" accesskey="&scratchpad.accesskey;"/>
+                  <menuitem id="menu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor" accesskey="&styleeditor.accesskey;"/>
+                  <menuitem id="menu_pageSource" observes="devtoolsMenuBroadcaster_PageSource" accesskey="&pageSourceCmd.accesskey;"/>
+                  <menuitem id="javascriptConsole" observes="devtoolsMenuBroadcaster_ErrorConsole" accesskey="&errorConsoleCmd.accesskey;"/>
                   <menuseparator id="devToolsEndSeparator"/>
-                  <menuitem id="getMoreDevtools"
-                            label="&getMoreDevtoolsCmd.label;"
-                            accesskey="&getMoreDevtoolsCmd.accesskey;"
-                            oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
+                  <menuitem id="getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools" accesskey="&getMoreDevtoolsCmd.accesskey;"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 4d8404ef59b..bde3f403bcd 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -88,16 +88,16 @@
 
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
-    <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();" disabled="true"/>
+    <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();"/>
     <command id="Tools:DevToolbarFocus" oncommand="DeveloperToolbar.focus();" disabled="true"/>
     <command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/>
-    <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
-    <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();" disabled="true"/>
-    <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();" disabled="true"/>
-    <command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();" disabled="true"/>
-    <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true"/>
-    <command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();" disabled="true"/>
-    <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();" disabled="true"/>
+    <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();"/>
+    <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();"/>
+    <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();"/>
+    <command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();"/>
+    <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();"/>
+    <command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();"/>
+    <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
@@ -181,6 +181,71 @@
     <broadcaster id="sync-syncnow-state"/>
 #endif
     <broadcaster id="workOfflineMenuitemState"/>
+
+    <!-- DevTools broadcasters -->
+    <broadcaster id="devtoolsMenuBroadcaster_DevToolbar"
+                 label="&devToolbarMenu.label;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:DevToolbar"
+                 key="key_devToolbar"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_WebConsole"
+                 label="&webConsoleCmd.label;"
+                 type="checkbox" autocheck="false"
+                 key="key_webConsole"
+                 command="Tools:WebConsole"/>
+    <broadcaster id="devtoolsMenuBroadcaster_Inspect"
+                 label="&inspectMenu.label;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:Inspect"
+                 key="key_inspect"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_Debugger"
+                 label="&debuggerMenu.label2;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:Debugger"
+                 key="key_debugger"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_RemoteDebugger"
+                 label="&remoteDebuggerMenu.label;"
+                 command="Tools:RemoteDebugger"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_ChromeDebugger"
+                 label="&chromeDebuggerMenu.label;"
+                 command="Tools:ChromeDebugger"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_Scratchpad"
+                 label="&scratchpad.label;"
+                 command="Tools:Scratchpad"
+                 key="key_scratchpad"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_StyleEditor"
+                 label="&styleeditor.label;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:StyleEditor"
+                 key="key_styleeditor"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_ResponsiveUI"
+                 label="&responsiveDesignTool.label;"
+                 type="checkbox" autocheck="false"
+                 command="Tools:ResponsiveUI"
+                 key="key_responsiveUI"
+                 disabled="true" hidden="true"/>
+    <broadcaster id="devtoolsMenuBroadcaster_PageSource"
+                 accesskey="&pageSourceCmd.accesskey;"
+                 label="&pageSourceCmd.label;"
+                 key="key_viewSource"
+                 command="View:PageSource"/>
+    <broadcaster id="devtoolsMenuBroadcaster_ErrorConsole"
+                 hidden="true"
+                 label="&errorConsoleCmd.label;"
+                 accesskey="&errorConsoleCmd.accesskey;"
+                 key="key_errorConsole"
+                 oncommand="toJavaScriptConsole();"/>
+    <broadcaster id="devtoolsMenuBroadcaster_GetMoreTools"
+                 label="&getMoreDevtoolsCmd.label;"
+                 accesskey="&getMoreDevtoolsCmd.accesskey;"
+                 oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
   </broadcasterset>
 
   <keyset id="mainKeyset">
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 181c81b7b95..f81561a8bd9 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -578,6 +578,12 @@ html|*#gcli-output-frame,
   -moz-box-pack: center;
 }
 
+/* We don't show the Style Editor button in the developer toolbar for now.
+   See bug 771203 */
+#developer-toolbar-styleeditor {
+  display: none;
+}
+
 /* Responsive Mode */
 
 vbox[anonid=browserContainer][responsivemode] {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 0edd9493b13..6f2b5b5b233 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1402,12 +1402,10 @@ var gBrowserInit = {
     // Enable developer toolbar?
     let devToolbarEnabled = gPrefService.getBoolPref("devtools.toolbar.enabled");
     if (devToolbarEnabled) {
-      document.getElementById("menu_devToolbar").hidden = false;
-      document.getElementById("Tools:DevToolbar").removeAttribute("disabled");
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_DevToolbar");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
       document.getElementById("Tools:DevToolbarFocus").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_devToolbar").hidden = false;
-#endif
 
       // Show the toolbar if it was previously visible
       if (gPrefService.getBoolPref("devtools.toolbar.visible")) {
@@ -1418,33 +1416,25 @@ var gBrowserInit = {
     // Enable Inspector?
     let enabled = gPrefService.getBoolPref("devtools.inspector.enabled");
     if (enabled) {
-      document.getElementById("menu_pageinspect").hidden = false;
-      document.getElementById("Tools:Inspect").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_pageInspect").hidden = false;
-#endif
-      document.getElementById("developer-toolbar-inspector").hidden = false;
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Inspect");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
     // Enable Debugger?
     let enabled = gPrefService.getBoolPref("devtools.debugger.enabled");
     if (enabled) {
-      document.getElementById("menu_debugger").hidden = false;
-      document.getElementById("Tools:Debugger").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_debugger").hidden = false;
-#endif
-      document.getElementById("developer-toolbar-debugger").hidden = false;
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Debugger");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
     // Enable Remote Debugger?
     let enabled = gPrefService.getBoolPref("devtools.debugger.remote-enabled");
     if (enabled) {
-      document.getElementById("menu_remoteDebugger").hidden = false;
-      document.getElementById("Tools:RemoteDebugger").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_remoteDebugger").hidden = false;
-#endif
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_RemoteDebugger");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
     // Enable Chrome Debugger?
@@ -1452,45 +1442,34 @@ var gBrowserInit = {
                   gPrefService.getBoolPref("devtools.debugger.chrome-enabled") &&
                   gPrefService.getBoolPref("devtools.debugger.remote-enabled");
     if (enabled) {
-      document.getElementById("menu_chromeDebugger").hidden = false;
-      document.getElementById("Tools:ChromeDebugger").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_chromeDebugger").hidden = false;
-#endif
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ChromeDebugger");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
     // Enable Error Console?
     // XXX Temporarily always-enabled, see bug 601201
     let consoleEnabled = true || gPrefService.getBoolPref("devtools.errorconsole.enabled");
     if (consoleEnabled) {
-      document.getElementById("javascriptConsole").hidden = false;
-      document.getElementById("key_errorConsole").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_errorConsole").hidden = false;
-#endif
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ErrorConsole");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
     // Enable Scratchpad in the UI, if the preference allows this.
     let scratchpadEnabled = gPrefService.getBoolPref(Scratchpad.prefEnabledName);
     if (scratchpadEnabled) {
-      document.getElementById("menu_scratchpad").hidden = false;
-      document.getElementById("Tools:Scratchpad").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_scratchpad").hidden = false;
-#endif
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Scratchpad");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
     // Enable Style Editor?
     let styleEditorEnabled = gPrefService.getBoolPref(StyleEditor.prefEnabledName);
     if (styleEditorEnabled) {
-      document.getElementById("menu_styleeditor").hidden = false;
-      document.getElementById("Tools:StyleEditor").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_styleeditor").hidden = false;
-#endif
-      // We don't show the Style Editor button in the developer toolbar for now.
-      // See bug 771203
-      // document.getElementById("developer-toolbar-styleeditor").hidden = false;
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_StyleEditor");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
 #ifdef MENUBAR_CAN_AUTOHIDE
@@ -1505,11 +1484,9 @@ var gBrowserInit = {
     // Enable Responsive UI?
     let responsiveUIEnabled = gPrefService.getBoolPref("devtools.responsiveUI.enabled");
     if (responsiveUIEnabled) {
-      document.getElementById("menu_responsiveUI").hidden = false;
-      document.getElementById("Tools:ResponsiveUI").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-      document.getElementById("appmenu_responsiveUI").hidden = false;
-#endif
+      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ResponsiveUI");
+      broadcaster.removeAttribute("disabled");
+      broadcaster.removeAttribute("hidden");
     }
 
     let appMenuButton = document.getElementById("appmenu-button");
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index fc9237d8a6b..f7ff3be060a 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1125,24 +1125,35 @@
             <textbox class="gclitoolbar-input-node" rows="1"/>
           </stack>
           <toolbarbutton id="developer-toolbar-webconsole"
-                         label="&webConsoleButton.label;"
                          class="developer-toolbar-button"
-                         command="Tools:WebConsole"/>
+                         observes="devtoolsMenuBroadcaster_WebConsole"/>
           <toolbarbutton id="developer-toolbar-inspector"
-                         label="&inspectorButton.label;"
                          class="developer-toolbar-button"
-                         hidden="true"
-                         command="Tools:Inspect"/>
+                         observes="devtoolsMenuBroadcaster_Inspect"/>
           <toolbarbutton id="developer-toolbar-styleeditor"
-                         label="&styleeditor.label;"
                          class="developer-toolbar-button"
-                         hidden="true"
-                         command="Tools:StyleEditor"/>
+                         observes="devtoolsMenuBroadcaster_StyleEditor"/>
           <toolbarbutton id="developer-toolbar-debugger"
-                         label="&debuggerMenu.label2;"
                          class="developer-toolbar-button"
-                         hidden="true"
-                         command="Tools:Debugger"/>
+                         observes="devtoolsMenuBroadcaster_Debugger"/>
+          <toolbarbutton id="developer-toolbar-other-tools"
+                         type="menu"
+                         class="developer-toolbar-button"
+                         label="&devToolbarOtherToolsButton.label;">
+            <menupopup position="before_end">
+               <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/>
+               <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
+               <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
+               <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
+               <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/>
+               <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/>
+               <menuitem observes="devtoolsMenuBroadcaster_PageSource"/>
+               <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/>
+               <menuseparator/>
+               <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/>
+            </menupopup>
+          </toolbarbutton>
+
 #ifndef XP_MACOSX
           <toolbarbutton id="developer-toolbar-closebutton"
                          class="devtools-closebutton"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 36cb4e39add..468aa455669 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -241,6 +241,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
+<!ENTITY devToolbarOtherToolsButton.label  "More Tools">
 
 <!ENTITY webConsoleButton.label "Web Console">
 <!ENTITY inspectorButton.label "Inspector">
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index 51b440aea5e..6b422e986a9 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -2551,6 +2551,7 @@ stack[anonid=browserStack][responsivemode] {
   list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
 }
 
+.developer-toolbar-button[open=true],
 .developer-toolbar-button:active:hover,
 .developer-toolbar-button[checked=true] {
   border-color: hsla(210,8%,5%,.6);
@@ -2580,6 +2581,14 @@ stack[anonid=browserStack][responsivemode] {
   -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 
+#developer-toolbar-other-tools {
+  -moz-image-region: rect(64px, 16px, 80px, 0);
+}
+
+#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* Error counter */
 
 #developer-toolbar-webconsole[error-count]:before {
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index 679ff97c00b..d6dd76eb617 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -3305,6 +3305,7 @@ stack[anonid=browserStack][responsivemode] {
   list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
 }
 
+.developer-toolbar-button[open=true],
 .developer-toolbar-button:active:hover,
 .developer-toolbar-button[checked=true] {
   border-color: hsla(210,8%,5%,.6);
@@ -3334,6 +3335,14 @@ stack[anonid=browserStack][responsivemode] {
   -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 
+#developer-toolbar-other-tools {
+  -moz-image-region: rect(64px, 16px, 80px, 0);
+}
+
+#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* Error counter */
 
 #developer-toolbar-webconsole[error-count]:before {
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index da599ccec6a..6ab89c67ecd 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -3232,6 +3232,7 @@ stack[anonid=browserStack][responsivemode] {
   list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
 }
 
+.developer-toolbar-button[open=true],
 .developer-toolbar-button:active:hover,
 .developer-toolbar-button[checked=true] {
   border-color: hsla(210,8%,5%,.6);
@@ -3261,6 +3262,14 @@ stack[anonid=browserStack][responsivemode] {
   -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 
+#developer-toolbar-other-tools {
+  -moz-image-region: rect(64px, 16px, 80px, 0);
+}
+
+#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* Error counter */
 
 #developer-toolbar-webconsole[error-count]:before {

From 64bdde61d2036ce50341bd428b82100b758971af Mon Sep 17 00:00:00 2001
From: Sankha Narayan Guria <sankha93@gmail.com>
Date: Tue, 10 Jul 2012 22:28:00 +0300
Subject: [PATCH 044/118] Bug 739151 - Tilt now supports frames;
 r=vporof,rcampbell

---
 browser/devtools/tilt/TiltUtils.jsm           |   2 +-
 browser/devtools/tilt/test/Makefile.in        |   1 +
 .../tilt/test/browser_tilt_utils07.js         | 192 ++++++++++++++++++
 3 files changed, 194 insertions(+), 1 deletion(-)
 create mode 100644 browser/devtools/tilt/test/browser_tilt_utils07.js

diff --git a/browser/devtools/tilt/TiltUtils.jsm b/browser/devtools/tilt/TiltUtils.jsm
index ff8898af1f9..c142feb9e6b 100644
--- a/browser/devtools/tilt/TiltUtils.jsm
+++ b/browser/devtools/tilt/TiltUtils.jsm
@@ -441,7 +441,7 @@ TiltUtils.DOM = {
         }
 
         // prepare the queue array
-        Array.prototype.push.apply(queue, name === "iframe" ?
+        Array.prototype.push.apply(queue, name === "iframe" || name === "frame" ?
                                           node.contentDocument.childNodes :
                                           node.childNodes);
       }
diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in
index 3f5c66e38f4..79b9976b583 100644
--- a/browser/devtools/tilt/test/Makefile.in
+++ b/browser/devtools/tilt/test/Makefile.in
@@ -56,6 +56,7 @@ MOCHITEST_BROWSER_FILES += \
 	browser_tilt_utils04.js \
 	browser_tilt_utils05.js \
 	browser_tilt_utils06.js \
+	browser_tilt_utils07.js \
 	browser_tilt_visualizer.js \
 	browser_tilt_zoom.js \
 	$(NULL)
diff --git a/browser/devtools/tilt/test/browser_tilt_utils07.js b/browser/devtools/tilt/test/browser_tilt_utils07.js
new file mode 100644
index 00000000000..e40aa8ec270
--- /dev/null
+++ b/browser/devtools/tilt/test/browser_tilt_utils07.js
@@ -0,0 +1,192 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+function init(callback) {
+  let iframe = gBrowser.ownerDocument.createElement("iframe");
+
+  iframe.addEventListener("load", function onLoad() {
+    iframe.removeEventListener("load", onLoad, true);
+    callback(iframe);
+
+    gBrowser.parentNode.removeChild(iframe);
+    finish();
+  }, true);
+
+  iframe.setAttribute("src", ["data:text/html,",
+    "<!DOCTYPE html>",
+    "<html>",
+      "<body style='margin: 0;'>",
+        "<frameset cols='50%,50%'>",
+          "<frame src='",
+          ["data:text/html,",
+           "<!DOCTYPE html>",
+           "<html>",
+           "<body style='margin: 0;'>",
+           "<div id='test-div' style='width: 123px; height: 456px;'></div>",
+           "</body>",
+           "</html>"
+          ].join(""),
+          "' />",
+          "<frame src='",
+          ["data:text/html,",
+           "<!DOCTYPE html>",
+           "<html>",
+           "<body style='margin: 0;'>",
+           "<span></span>",
+           "</body>",
+           "</html>"
+          ].join(""),
+          "' />",
+        "</frameset>",
+        "<iframe src='",
+        ["data:text/html,",
+         "<!DOCTYPE html>",
+         "<html>",
+         "<body>",
+         "<span></span>",
+         "</body>",
+         "</html>"
+        ].join(""),
+        "'></iframe>",
+        "<frame src='",
+        ["data:text/html,",
+         "<!DOCTYPE html>",
+         "<html>",
+         "<body style='margin: 0;'>",
+         "<span></span>",
+         "</body>",
+         "</html>"
+        ].join(""),
+        "' />",
+        "<frame src='",
+        ["data:text/html,",
+         "<!DOCTYPE html>",
+         "<html>",
+         "<body style='margin: 0;'>",
+         "<iframe src='",
+         ["data:text/html,",
+          "<!DOCTYPE html>",
+          "<html>",
+          "<body>",
+          "<div></div>",
+          "</body>",
+          "</html>"
+         ].join(""),
+         "'></iframe>",
+         "</body>",
+         "</html>"
+        ].join(""),
+        "' />",
+      "</body>",
+    "</html>"
+  ].join(""));
+
+  gBrowser.parentNode.appendChild(iframe);
+}
+
+function test() {
+  waitForExplicitFinish();
+  ok(TiltUtils, "The TiltUtils object doesn't exist.");
+
+  let dom = TiltUtils.DOM;
+  ok(dom, "The TiltUtils.DOM wasn't found.");
+
+  init(function(iframe) {
+    let cwDimensions = dom.getContentWindowDimensions(iframe.contentWindow);
+
+    is(cwDimensions.width - iframe.contentWindow.scrollMaxX,
+      iframe.contentWindow.innerWidth,
+      "The content window width wasn't calculated correctly.");
+    is(cwDimensions.height - iframe.contentWindow.scrollMaxY,
+      iframe.contentWindow.innerHeight,
+      "The content window height wasn't calculated correctly.");
+
+    let nodeCoordinates = LayoutHelpers.getRect(
+      iframe.contentDocument.getElementById("test-div"), iframe.contentWindow);
+
+    let frameOffset = LayoutHelpers.getIframeContentOffset(iframe);
+    let frameRect = iframe.getBoundingClientRect();
+
+    is(nodeCoordinates.top, frameRect.top + frameOffset[0],
+      "The node coordinates top value wasn't calculated correctly.");
+    is(nodeCoordinates.left, frameRect.left + frameOffset[1],
+      "The node coordinates left value wasn't calculated correctly.");
+    is(nodeCoordinates.width, 123,
+      "The node coordinates width value wasn't calculated correctly.");
+    is(nodeCoordinates.height, 456,
+      "The node coordinates height value wasn't calculated correctly.");
+
+
+    let store = dom.traverse(iframe.contentWindow);
+
+    is(store.nodes.length, 16,
+      "The traverse() function didn't walk the correct number of nodes.");
+    is(store.info.length, 16,
+      "The traverse() function didn't examine the correct number of nodes.");
+    is(store.info[0].name, "html",
+      "the 1st traversed node isn't the expected one.");
+    is(store.info[0].depth, 0,
+      "the 1st traversed node doesn't have the expected depth.");
+    is(store.info[1].name, "head",
+      "the 2nd traversed node isn't the expected one.");
+    is(store.info[1].depth, 1,
+      "the 2nd traversed node doesn't have the expected depth.");
+    is(store.info[2].name, "body",
+      "the 3rd traversed node isn't the expected one.");
+    is(store.info[2].depth, 1,
+      "the 3rd traversed node doesn't have the expected depth.");
+    is(store.info[3].name, "div",
+      "the 4th traversed node isn't the expected one.");
+    is(store.info[3].depth, 2,
+      "the 4th traversed node doesn't have the expected depth.");
+    is(store.info[4].name, "span",
+      "the 5th traversed node isn't the expected one.");
+    is(store.info[4].depth, 2,
+      "the 5th traversed node doesn't have the expected depth.");
+    is(store.info[5].name, "iframe",
+      "the 6th traversed node isn't the expected one.");
+    is(store.info[5].depth, 2,
+      "the 6th traversed node doesn't have the expected depth.");
+    is(store.info[6].name, "span",
+      "the 7th traversed node isn't the expected one.");
+    is(store.info[6].depth, 2,
+      "the 7th traversed node doesn't have the expected depth.");
+    is(store.info[7].name, "iframe",
+      "the 8th traversed node isn't the expected one.");
+    is(store.info[7].depth, 2,
+      "the 8th traversed node doesn't have the expected depth.");
+    is(store.info[8].name, "html",
+      "the 9th traversed node isn't the expected one.");
+    is(store.info[8].depth, 3,
+      "the 9th traversed node doesn't have the expected depth.");
+    is(store.info[9].name, "html",
+      "the 10th traversed node isn't the expected one.");
+    is(store.info[9].depth, 3,
+      "the 10th traversed node doesn't have the expected depth.");
+    is(store.info[10].name, "head",
+      "the 11th traversed node isn't the expected one.");
+    is(store.info[10].depth, 4,
+      "the 11th traversed node doesn't have the expected depth.");
+    is(store.info[11].name, "body",
+      "the 12th traversed node isn't the expected one.");
+    is(store.info[11].depth, 4,
+      "the 12th traversed node doesn't have the expected depth.");
+    is(store.info[12].name, "head",
+      "the 13th traversed node isn't the expected one.");
+    is(store.info[12].depth, 4,
+      "the 13th traversed node doesn't have the expected depth.");
+    is(store.info[13].name, "body",
+      "the 14th traversed node isn't the expected one.");
+    is(store.info[13].depth, 4,
+      "the 14th traversed node doesn't have the expected depth.");
+    is(store.info[14].name, "span",
+      "the 15th traversed node isn't the expected one.");
+    is(store.info[14].depth, 5,
+      "the 15th traversed node doesn't have the expected depth.");
+    is(store.info[15].name, "div",
+      "the 16th traversed node isn't the expected one.");
+    is(store.info[15].depth, 5,
+      "the 16th traversed node doesn't have the expected depth.");
+  });
+}

From befb4a18922db6d8c493f4f448a7828bbd1d2058 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Wed, 18 Jul 2012 13:47:12 -0400
Subject: [PATCH 045/118] Bug 775100 - Remove 'xxx' logging in HistoryTab
 r=wesj

---
 mobile/android/base/awesomebar/HistoryTab.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mobile/android/base/awesomebar/HistoryTab.java b/mobile/android/base/awesomebar/HistoryTab.java
index 7aca43c2161..74b456786f0 100644
--- a/mobile/android/base/awesomebar/HistoryTab.java
+++ b/mobile/android/base/awesomebar/HistoryTab.java
@@ -183,11 +183,9 @@ public class HistoryTab extends AwesomeBarTab {
             // The bookmark id will be 0 (null in database) when the url
             // is not a bookmark. Reading list items are irrelevant in history
             // tab. We should never show any sign or them.
-            Log.i(LOGTAG, "xxx vis: " + bookmarkId + " " + display + " " + Combined.DISPLAY_READER);
             int visibility = (bookmarkId != 0 && display != Combined.DISPLAY_READER ?
                               View.VISIBLE : View.GONE);
 
-            Log.i(LOGTAG, "xxx vh: " + viewHolder.bookmarkIconView);
             viewHolder.bookmarkIconView.setVisibility(visibility);
             viewHolder.bookmarkIconView.setImageResource(R.drawable.ic_awesomebar_star);
 

From fdef80a11c62ee35169f0dc0d160f4ca9706ceac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 18 Jul 2012 19:52:14 +0200
Subject: [PATCH 046/118] Bug 774298 - Remove obsolete "Inspector /
 Highlighter" styling. r=rcampbell

---
 browser/themes/gnomestripe/browser.css | 25 -------------------------
 browser/themes/pinstripe/browser.css   | 25 -------------------------
 browser/themes/winstripe/browser.css   | 25 -------------------------
 3 files changed, 75 deletions(-)

diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index 39a734756db..ae0c4d15977 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -1905,31 +1905,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   opacity: .3;
 }
 
-/* Inspector / Highlighter */
-
-#highlighter-panel {
-  -moz-appearance: none;
-  -moz-window-shadow: none;
-  background: -moz-linear-gradient(top -1deg, #ffdd88, #ffeeaa);
-  border: none;
-  opacity: 0.35;
-}
-
-listitem.style-selector {
-  background-color: DarkGray;
-  color: white;
-}
-
-listitem.style-section {
-  background-color: LightGray;
-  color: black;
-  font-weight: bold;
-}
-
-panel[dimmed="true"] {
-  opacity: 0.5;
-}
-
 /* Add-on bar */
 
 #addon-bar {
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index 3c4ca4fcc16..55e3b3e6e1c 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -2624,31 +2624,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   box-shadow: @focusRingShadow@;
 }
 
-/* Inspector / Highlighter */
-
-#highlighter-panel {
-  -moz-appearance: none;
-  -moz-window-shadow: none;
-  background: -moz-linear-gradient(top -1deg, #ffdd88, #ffeeaa);
-  border: none;
-  opacity: 0.35;
-}
-
-listitem.style-selector {
-  background-color: DarkGray;
-  color: white;
-}
-
-listitem.style-section {
-  background-color: LightGray;
-  color: black;
-  font-weight: bold;
-}
-
-panel[dimmed="true"] {
-  opacity: 0.5;
-}
-
 /* Add-on bar */
 
 #addon-bar {
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index 67e659082e6..2920f3716ef 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -2568,31 +2568,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   outline: 1px dotted -moz-dialogText;
 }
 
-/* Inspector / Highlighter */
-
-#highlighter-panel {
-  -moz-appearance: none;
-  -moz-window-shadow: none;
-  background: -moz-linear-gradient(top -1deg, #ffdd88, #ffeeaa);
-  border: none;
-  opacity: 0.35;
-}
-
-listitem.style-selector {
-  background-color: DarkGray;
-  color: white;
-}
-
-listitem.style-section {
-  background-color: LightGray;
-  color: black;
-  font-weight: bold;
-}
-
-panel[dimmed="true"] {
-  opacity: 0.5;
-}
-
 /* Add-on bar */
 
 #addon-bar {

From 958e2c965e6fef74f1743179b2f72be26af43602 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 18 Jul 2012 13:47:40 -0400
Subject: [PATCH 047/118] Bug 774077 - Fix Clang warning in
 nsSVGGraphicElement.cpp. r=dholbert.

--HG--
extra : rebase_source : 20a6001c421008c19d6000541077c78819520393
---
 content/svg/content/src/nsSVGGraphicElement.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/svg/content/src/nsSVGGraphicElement.cpp b/content/svg/content/src/nsSVGGraphicElement.cpp
index cd33cf3903e..28e74d46db4 100644
--- a/content/svg/content/src/nsSVGGraphicElement.cpp
+++ b/content/svg/content/src/nsSVGGraphicElement.cpp
@@ -237,7 +237,7 @@ void
 nsSVGGraphicElement::SetAnimateMotionTransform(const gfxMatrix* aMatrix)
 {
   if ((!aMatrix && !mAnimateMotionTransform) ||
-      aMatrix && mAnimateMotionTransform && *aMatrix == *mAnimateMotionTransform) {
+      (aMatrix && mAnimateMotionTransform && *aMatrix == *mAnimateMotionTransform)) {
     return;
   }
   mAnimateMotionTransform = aMatrix ? new gfxMatrix(*aMatrix) : nsnull;

From 87df7900f8439285f1beafd21a643a3b18b87d2a Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Wed, 18 Jul 2012 13:57:54 -0400
Subject: [PATCH 048/118] Regression test for bug 769942 (DLBI broke
 invalidation of foreignObjects in filters). r=longsonr.

--HG--
extra : rebase_source : 9042dda0fbb7ae586eb79de6eddc15830c1c7d69
---
 .../dynamic-filtered-foreignObject-01.svg     | 31 +++++++++++++++++++
 layout/reftests/svg/filters/reftest.list      |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg

diff --git a/layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg b/layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg
new file mode 100644
index 00000000000..06dbc8192c7
--- /dev/null
+++ b/layout/reftests/svg/filters/dynamic-filtered-foreignObject-01.svg
@@ -0,0 +1,31 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg" class="reftest-wait">
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=769942 -->
+  <script>
+
+function run_test() {
+  var fO = document.getElementById("fO");
+  fO.parentNode.removeChild(fO);
+  document.documentElement.removeAttribute("class");
+}
+
+document.addEventListener("MozReftestInvalidate", run_test);
+setTimeout(run_test, 3000);
+
+  </script>
+  <filter id="filter" x="0" y="0" width="150" height="150"
+          filterUnits="userSpaceOnUse"
+          primitiveUnits="userSpaceOnUse">
+    <feOffset dx="-50" dy="-50"/>
+  </filter>
+  <rect width="100%" height="100%" fill="lime"/>
+  <g filter="url(#filter)">
+    <foreignObject id="fO" x="50" y="50" width="100" height="100">
+      <div xmlns="http://www.w3.org/1999/xhtml"
+           style="display:block; width:100%; height:100%; background:red;"/>
+    </foreignObject>
+  </g>
+</svg>
diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list
index f6855ea38f8..34f672c85e2 100644
--- a/layout/reftests/svg/filters/reftest.list
+++ b/layout/reftests/svg/filters/reftest.list
@@ -2,6 +2,8 @@
 # subregion. The fe*-2 tests test with no clipping (which stresses
 # the automatic optimal surface-size computation a bit more).
 
+== dynamic-filtered-foreignObject-01.svg pass.svg
+
 == feBlend-1.svg feBlend-1-ref.svg
 == feBlend-2.svg feBlend-2-ref.svg
 

From ebfb3f57c92b0f9e8c0f5ac7e4e0f45d5b8d7134 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 18 Jul 2012 11:38:02 -0700
Subject: [PATCH 049/118] Bug 769594 - Make nsContentUtils use
 TestPermissionFromPrincipal instead of TestPermission. r=sicking

---
 content/base/src/nsContentUtils.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 57b7ae00231..5425f0c53a6 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -2774,17 +2774,9 @@ nsContentUtils::IsDraggableLink(const nsIContent* aContent) {
 static bool
 TestSitePerm(nsIPrincipal* aPrincipal, const char* aType, PRUint32 aPerm)
 {
-  if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
-    // System principal is always allowed and never denied permission.
-    return aPerm == nsIPermissionManager::ALLOW_ACTION;
-  }
-
-  nsCOMPtr<nsIURI> uri;
-  if (NS_FAILED(!aPrincipal ||
-      aPrincipal->GetURI(getter_AddRefs(uri))) ||
-      !uri) {
-    // We always deny (i.e. don't allow) the permission if we don't
-    // have a principal or we don't know the URI.
+  if (!aPrincipal) {
+    // We always deny (i.e. don't allow) the permission if we don't have a
+    // principal.
     return aPerm != nsIPermissionManager::ALLOW_ACTION;
   }
 
@@ -2793,9 +2785,9 @@ TestSitePerm(nsIPrincipal* aPrincipal, const char* aType, PRUint32 aPerm)
   NS_ENSURE_TRUE(permMgr, false);
 
   PRUint32 perm;
-  nsresult rv = permMgr->TestPermission(uri, aType, &perm);
+  nsresult rv = permMgr->TestPermissionFromPrincipal(aPrincipal, aType, &perm);
   NS_ENSURE_SUCCESS(rv, false);
-  
+
   return perm == aPerm;
 }
 

From ed81635232a6ce889a9a3ebc8baee3586a7d5128 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Wed, 18 Jul 2012 11:31:05 -0700
Subject: [PATCH 050/118] Bug 765498 - Device Storage - Gaia - ensure /sdcard
 is backed by a file system. r=dhylands

--HG--
extra : rebase_source : c36eaa86566f7b7bd6eeefbcbc0622ec99a33816
---
 dom/devicestorage/nsDeviceStorage.cpp | 29 ++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp
index 38dc5be47d8..d9b1328377f 100644
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -25,6 +25,10 @@
 // Microsoft's API Name hackery sucks
 #undef CreateEvent
 
+#ifdef MOZ_WIDGET_GONK
+#include "nsIVolumeService.h"
+#endif
+
 using namespace mozilla::dom;
 using namespace mozilla::dom::devicestorage;
 
@@ -270,15 +274,26 @@ nsDOMDeviceStorage::SetRootFileForType(const nsAString& aType, const PRInt32 aIn
   NS_ASSERTION(dirService, "Must have directory service");
 
 #ifdef MOZ_WIDGET_GONK
-  // check that /sdcard exists, if it doesn't go no further.
-  NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f));
-  bool check = false;
-  f->Exists(&check);
-  if (!check) {
-    mFile = nsnull;
+  mFile = nsnull;
+
+  nsCOMPtr<nsIVolumeService> vs = do_GetService(NS_VOLUMESERVICE_CONTRACTID);
+  if (!vs) {
+    return typeResult;
+  }
+
+  nsCOMPtr<nsIVolume> v;
+  vs->GetVolumeByPath(NS_LITERAL_STRING("/sdcard"), getter_AddRefs(v));
+  
+  if (!v) {
+    return typeResult;
+  }
+
+  PRInt32 state;
+  v->GetState(&state);
+
+  if (state != nsIVolume::STATE_MOUNTED) {
     return typeResult;
   }
-  f = nsnull;
 #endif
 
   // Picture directory

From 64a3aef5057525cf3a2e03a6121e06cded9e1618 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Wed, 18 Jul 2012 14:56:42 -0400
Subject: [PATCH 051/118] Bug 773100 - Invalidate the frame bounds instead of
 deleting the frame property. r=roc

---
 layout/base/FrameLayerBuilder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 7dd3750825c..9762791e302 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2305,7 +2305,7 @@ InternalInvalidateThebesLayersInSubtree(nsIFrame* aFrame)
   if (aFrame->GetStateBits() & NS_FRAME_HAS_CONTAINER_LAYER) {
     // Delete the invalid region to indicate that all Thebes contents
     // need to be invalidated
-    aFrame->Properties().Delete(ThebesLayerInvalidRegionProperty());
+    FrameLayerBuilder::InvalidateThebesLayerContents(aFrame, aFrame->GetVisualOverflowRectRelativeToSelf());
     foundContainerLayer = true;
   }
 

From 7729101eae620afced6fa08ff8a7ed03228a4bdc Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Wed, 18 Jul 2012 15:02:12 -0400
Subject: [PATCH 052/118] Bug 767337; remove D3D10_RESOURCE_MISC_GDI_COMPATIBLE
 flag from D3D10 layer manager. r=roc

---
 gfx/layers/d3d10/LayerManagerD3D10.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gfx/layers/d3d10/LayerManagerD3D10.cpp b/gfx/layers/d3d10/LayerManagerD3D10.cpp
index 2d8d6313a5f..b73e7605722 100644
--- a/gfx/layers/d3d10/LayerManagerD3D10.cpp
+++ b/gfx/layers/d3d10/LayerManagerD3D10.cpp
@@ -452,7 +452,6 @@ LayerManagerD3D10::CreateDrawTarget(const IntSize &aSize,
   
   CD3D10_TEXTURE2D_DESC desc(DXGI_FORMAT_B8G8R8A8_UNORM, aSize.width, aSize.height, 1, 1);
   desc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE;
-  desc.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE;
   
   HRESULT hr = device()->CreateTexture2D(&desc, NULL, getter_AddRefs(texture));
 

From 8564f0e282436feb9e6be4180cc956276ada24f6 Mon Sep 17 00:00:00 2001
From: Nicholas Cameron <ncameron@mozilla.com>
Date: Wed, 18 Jul 2012 15:04:15 -0400
Subject: [PATCH 053/118] Bug 767337; crash test. r=roc

---
 content/canvas/crashtests/767337-1.html   | 21 +++++++++++++++++++++
 content/canvas/crashtests/crashtests.list |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 content/canvas/crashtests/767337-1.html

diff --git a/content/canvas/crashtests/767337-1.html b/content/canvas/crashtests/767337-1.html
new file mode 100644
index 00000000000..3c2c4ebd184
--- /dev/null
+++ b/content/canvas/crashtests/767337-1.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<body>
+<canvas id="c" width="500" height="1000">
+</canvas>
+<script>
+var ctxt = document.getElementById('c').getContext('2d');
+for (var k = 0; k < 100; ++j) {
+  for (var j = 0; j < 10; ++j) {
+    for (var i = 0; i < 1000; ++i) {
+      gradient = ctxt.createLinearGradient(0,0,200,i);
+      gradient.addColorStop(0,'black');
+      gradient.addColorStop(1,'rgba(0, 255*k/100, 0, 0.1)');
+      ctxt.fillStyle = gradient;
+      ctxt.fillRect(j*50, 2*i, 50, 2);
+    }
+  }
+}
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/content/canvas/crashtests/crashtests.list b/content/canvas/crashtests/crashtests.list
index 9b73455198b..eeded07f3fb 100644
--- a/content/canvas/crashtests/crashtests.list
+++ b/content/canvas/crashtests/crashtests.list
@@ -10,3 +10,4 @@ load 746813-1.html
 # this test crashes in a bunch places still
 #load 745818-large-source.html
 load 743499-negative-size.html
+load 767337-1.html

From 7653fc01cd59826f95a5dfa7de4182a4e4e96726 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Wed, 18 Jul 2012 15:11:51 -0400
Subject: [PATCH 054/118] bug 763621 - Fix a Breakpad issue, patch from
 upstream r792. r=upstream

--HG--
extra : rebase_source : 5f8c09fcc2172fe60b524e8e3d1026d35e7c95aa
---
 .../src/client/linux/minidump_writer/minidump_writer.cc  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
index ad36636656c..8457d080667 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
@@ -1308,6 +1308,15 @@ popline:
     if (!memory.Allocate(total))
       return false;
     for (MDRVA pos = memory.position(); buffers; buffers = buffers->next) {
+      // Check for special case of a zero-length buffer.  This should only
+      // occur if a file's size happens to be a multiple of the buffer's
+      // size, in which case the final sys_read() will have resulted in
+      // zero bytes being read after the final buffer was just allocated.
+      if (buffers->len == 0) {
+        // This can only occur with final buffer.
+        assert(buffers->next == NULL);
+        continue;
+      }
       memory.Copy(pos, &buffers->data, buffers->len);
       pos += buffers->len;
     }

From a413daa7904051639c90999b2e45aa7d8ca06799 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted.mielczarek@gmail.com>
Date: Mon, 16 Jul 2012 14:11:11 -0400
Subject: [PATCH 055/118] bug 761907 - use sys_fstat64 on Android and gonk.
 r=upstream

--HG--
extra : rebase_source : 75b02da45b38bfa5ae7e48401b7c0715b65e9640
---
 .../linux/minidump_writer/linux_dumper.cc     |  14 +-
 .../src/common/linux/linux_syscall_support.h  | 166 ++++++++++--------
 2 files changed, 106 insertions(+), 74 deletions(-)

diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc
index 0bae47a2386..6e4ccd3a708 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc
@@ -247,18 +247,24 @@ LinuxDumper::ElfFileIdentifierForMapping(const MappingInfo& mapping,
   int fd = sys_open(mapping.name, O_RDONLY, 0);
   if (fd < 0)
     return false;
+
+#if defined(__x86_64)
+#define sys_mmap2 sys_mmap
   struct kernel_stat st;
   if (sys_fstat(fd, &st) != 0) {
+#else
+  struct kernel_stat64 st;
+  if (sys_fstat64(fd, &st) != 0) {
+#endif
     sys_close(fd);
     return false;
   }
-#if defined(__x86_64)
-#define sys_mmap2 sys_mmap
-#endif
+
   void* base = sys_mmap2(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
   sys_close(fd);
-  if (base == MAP_FAILED)
+  if (base == MAP_FAILED) {
     return false;
+  }
 
   bool success = FileID::ElfFileIdentifierFromMappedFile(base, identifier);
   sys_munmap(base, st.st_size);
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/linux_syscall_support.h b/toolkit/crashreporter/google-breakpad/src/common/linux/linux_syscall_support.h
index 92aa8b4c649..2132ff7573c 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/linux_syscall_support.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/linux_syscall_support.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2010, Google Inc.
+/* Copyright (c) 2005-2011, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -119,20 +119,17 @@ extern "C" {
 #endif
 #endif
 
-/* The Android NDK #defines these. */
-#ifdef stat64
-#undef stat64
+/* The Android NDK's <sys/stat.h> #defines these macros as aliases
+ * to their non-64 counterparts. To avoid naming conflict, remove them. */
+#ifdef __ANDROID__
+# pragma push_macro("stat64")
+# pragma push_macro("fstat64")
+# pragma push_macro("lstat64")
+# undef stat64
+# undef fstat64
+# undef lstat64
 #endif
 
-#ifdef fstat64
-#undef fstat64
-#endif
-
-#ifdef lstat64
-#undef lstat64
-#endif
-
-
 /* As glibc often provides subtly incompatible data structures (and implicit
  * wrapper functions that convert them), we provide our own kernel data
  * structures for use by the system calls.
@@ -1360,7 +1357,7 @@ struct kernel_statfs {
 
 
 /* After forking, we must make sure to only call system calls.               */
-#if __BOUNDED_POINTERS__
+#if defined(__BOUNDED_POINTERS__)
   #error "Need to port invocations of syscalls for bounded ptrs"
 #else
   /* The core dumper and the thread lister get executed after threads
@@ -1393,27 +1390,27 @@ struct kernel_statfs {
   #undef LSS_NAME
   #ifndef SYS_PREFIX
     #define LSS_NAME(name) sys_##name
-  #elif SYS_PREFIX < 0
+  #elif defined(SYS_PREFIX) && SYS_PREFIX < 0
     #define LSS_NAME(name) name
-  #elif SYS_PREFIX == 0
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 0
     #define LSS_NAME(name) sys0_##name
-  #elif SYS_PREFIX == 1
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 1
     #define LSS_NAME(name) sys1_##name
-  #elif SYS_PREFIX == 2
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 2
     #define LSS_NAME(name) sys2_##name
-  #elif SYS_PREFIX == 3
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 3
     #define LSS_NAME(name) sys3_##name
-  #elif SYS_PREFIX == 4
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 4
     #define LSS_NAME(name) sys4_##name
-  #elif SYS_PREFIX == 5
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 5
     #define LSS_NAME(name) sys5_##name
-  #elif SYS_PREFIX == 6
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 6
     #define LSS_NAME(name) sys6_##name
-  #elif SYS_PREFIX == 7
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 7
     #define LSS_NAME(name) sys7_##name
-  #elif SYS_PREFIX == 8
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 8
     #define LSS_NAME(name) sys8_##name
-  #elif SYS_PREFIX == 9
+  #elif defined(SYS_PREFIX) && SYS_PREFIX == 9
     #define LSS_NAME(name) sys9_##name
   #endif
 
@@ -1438,7 +1435,8 @@ struct kernel_statfs {
   #define LSS_RETURN(type, res, err)                                          \
     do {                                                                      \
       if (err) {                                                              \
-        LSS_ERRNO = (res);                                                    \
+        unsigned long __errnovalue = (res);                                   \
+        LSS_ERRNO = __errnovalue;                                             \
         res = -1;                                                             \
       }                                                                       \
       return (type) (res);                                                    \
@@ -1496,14 +1494,16 @@ struct kernel_statfs {
                            "mov  "SYS_SYSCALL_ENTRYPOINT"@GOT(%%eax), %%eax\n"\
                            "mov  0(%%eax), %%eax\n"                           \
                            "test %%eax, %%eax\n"                              \
-                           "jz   10001f\n"                                    \
+                           "jz   10002f\n"                                    \
                            "push %%eax\n"                                     \
-                           "lea  10002f, %%eax\n"                             \
+                           "call 10001f\n"                                    \
+                     "10001:pop  %%eax\n"                                     \
+                           "add  $(10003f-10001b), %%eax\n"                   \
                            "xchg 4(%%esp), %%eax\n"                           \
                            "ret\n"                                            \
-                     "10001:pop  %%eax\n"                                     \
+                     "10002:pop  %%eax\n"                                     \
                            "int $0x80\n"                                      \
-                     "10002:\n"
+                     "10003:\n"
     #else
     #define LSS_ENTRYPOINT "int $0x80\n"
     #endif
@@ -1859,8 +1859,6 @@ struct kernel_statfs {
                                    void *newtls, int *child_tidptr) {
       long __res;
       {
-        register void *__tls  __asm__("r8")  = newtls;
-        register int  *__ctid __asm__("r10") = child_tidptr;
         __asm__ __volatile__(/* if (fn == NULL)
                               *   return -EINVAL;
                               */
@@ -1891,6 +1889,8 @@ struct kernel_statfs {
                               *                %r10 = child_tidptr)
                               */
                              "movq   %2,%%rax\n"
+                             "movq   %9,%%r8\n"
+                             "movq   %10,%%r10\n"
                              LSS_ENTRYPOINT
 
                              /* if (%rax != 0)
@@ -1921,8 +1921,9 @@ struct kernel_statfs {
                              : "=a" (__res)
                              : "0"(-EINVAL), "i"(__NR_clone), "i"(__NR_exit),
                                "r"(fn), "S"(child_stack), "D"(flags), "r"(arg),
-                               "d"(parent_tidptr), "r"(__tls), "r"(__ctid)
-                             : "rsp", "memory", "r11", "rcx");
+                               "d"(parent_tidptr), "r"(newtls),
+                               "r"(child_tidptr)
+                             : "rsp", "memory", "r8", "r10", "r11", "rcx");
       }
       LSS_RETURN(int, __res);
     }
@@ -2224,10 +2225,11 @@ struct kernel_statfs {
     #define LSS_BODY(type,name,r7,...)                                        \
           register unsigned long __v0 __asm__("$2") = __NR_##name;            \
           __asm__ __volatile__ ("syscall\n"                                   \
-                                : "=&r"(__v0), r7 (__r7)                      \
+                                : "+r"(__v0), r7 (__r7)                       \
                                 : "0"(__v0), ##__VA_ARGS__                    \
                                 : "$8", "$9", "$10", "$11", "$12",            \
-                                  "$13", "$14", "$15", "$24", "memory");      \
+                                  "$13", "$14", "$15", "$24", "$25",          \
+                                  "memory");                                  \
           LSS_RETURN(type, __v0, __r7)
     #undef _syscall0
     #define _syscall0(type, name)                                             \
@@ -2273,20 +2275,19 @@ struct kernel_statfs {
                           type5 arg5) {                                       \
         LSS_REG(4, arg1); LSS_REG(5, arg2); LSS_REG(6, arg3);                 \
         LSS_REG(7, arg4);                                                     \
-        register unsigned long __v0 __asm__("$2");                            \
+        register unsigned long __v0 __asm__("$2") = __NR_##name;              \
         __asm__ __volatile__ (".set noreorder\n"                              \
-                              "lw    $2, %6\n"                                \
                               "subu  $29, 32\n"                               \
-                              "sw    $2, 16($29)\n"                           \
-                              "li    $2, %2\n"                                \
+                              "sw    %5, 16($29)\n"                           \
                               "syscall\n"                                     \
                               "addiu $29, 32\n"                               \
                               ".set reorder\n"                                \
-                              : "=&r"(__v0), "+r" (__r7)                      \
-                              : "i" (__NR_##name), "r"(__r4), "r"(__r5),      \
-                                "r"(__r6), "m" ((unsigned long)arg5)          \
+                              : "+r"(__v0), "+r" (__r7)                       \
+                              : "r"(__r4), "r"(__r5),                         \
+                                "r"(__r6), "r" ((unsigned long)arg5)          \
                               : "$8", "$9", "$10", "$11", "$12",              \
-                                "$13", "$14", "$15", "$24", "memory");        \
+                                "$13", "$14", "$15", "$24", "$25",            \
+                                "memory");                                    \
         LSS_RETURN(type, __v0, __r7);                                         \
       }
     #else
@@ -2311,23 +2312,21 @@ struct kernel_statfs {
                           type5 arg5, type6 arg6) {                           \
         LSS_REG(4, arg1); LSS_REG(5, arg2); LSS_REG(6, arg3);                 \
         LSS_REG(7, arg4);                                                     \
-        register unsigned long __v0 __asm__("$2");                            \
+        register unsigned long __v0 __asm__("$2") = __NR_##name;              \
         __asm__ __volatile__ (".set noreorder\n"                              \
-                              "lw    $2, %6\n"                                \
-                              "lw    $8, %7\n"                                \
                               "subu  $29, 32\n"                               \
-                              "sw    $2, 16($29)\n"                           \
-                              "sw    $8, 20($29)\n"                           \
-                              "li    $2, %2\n"                                \
+                              "sw    %5, 16($29)\n"                           \
+                              "sw    %6, 20($29)\n"                           \
                               "syscall\n"                                     \
                               "addiu $29, 32\n"                               \
                               ".set reorder\n"                                \
-                              : "=&r"(__v0), "+r" (__r7)                      \
-                              : "i" (__NR_##name), "r"(__r4), "r"(__r5),      \
+                              : "+r"(__v0), "+r" (__r7)                       \
+                              : "r"(__r4), "r"(__r5),                         \
                                 "r"(__r6), "r" ((unsigned long)arg5),         \
                                 "r" ((unsigned long)arg6)                     \
                               : "$8", "$9", "$10", "$11", "$12",              \
-                                "$13", "$14", "$15", "$24", "memory");        \
+                                "$13", "$14", "$15", "$24", "$25",            \
+                                "memory");                                    \
         LSS_RETURN(type, __v0, __r7);                                         \
       }
     #else
@@ -2427,12 +2426,12 @@ struct kernel_statfs {
           #else
                              "daddu $29,16\n"
           #endif
-                             : "=&r" (__v0), "=r" (__r7)
+                             : "=&r" (__v0), "+r" (__r7)
                              : "i"(-EINVAL), "i"(__NR_clone), "i"(__NR_exit),
                                "r"(fn), "r"(__stack), "r"(__flags), "r"(arg),
                                "r"(__ptid), "r"(__r7), "r"(__ctid)
                              : "$9", "$10", "$11", "$12", "$13", "$14", "$15",
-                               "$24", "memory");
+                               "$24", "$25", "memory");
       }
       LSS_RETURN(int, __v0, __r7);
     }
@@ -3026,7 +3025,7 @@ struct kernel_statfs {
       return 0;
     }
   }
-  
+
   LSS_INLINE int LSS_NAME(sigismember)(struct kernel_sigset_t *set,
                                           int signum) {
     if (signum < 1 || signum > (int)(8*sizeof(set->sig))) {
@@ -3344,12 +3343,13 @@ struct kernel_statfs {
       register unsigned long __v1 __asm__("$3");
       register unsigned long __r7 __asm__("$7");
       __asm__ __volatile__ ("syscall\n"
-                            : "=&r"(__v0), "=&r"(__v1), "+r" (__r7)
+                            : "+r"(__v0), "=r"(__v1), "=r" (__r7)
                             : "0"(__v0)
                             : "$8", "$9", "$10", "$11", "$12",
-                              "$13", "$14", "$15", "$24", "memory");
+                              "$13", "$14", "$15", "$24", "$25", "memory");
       if (__r7) {
-        LSS_ERRNO = __v0;
+        unsigned long __errnovalue = __v0;
+        LSS_ERRNO = __errnovalue;
         return -1;
       } else {
         p[0] = __v0;
@@ -3469,14 +3469,32 @@ struct kernel_statfs {
     #define __NR__pread64   __NR_pread64
     #define __NR__pwrite64  __NR_pwrite64
     #define __NR__readahead __NR_readahead
-    LSS_INLINE _syscall5(ssize_t, _pread64,        int,         f,
-                         void *,         b, size_t, c, unsigned, o1,
-                         unsigned, o2)
-    LSS_INLINE _syscall5(ssize_t, _pwrite64,       int,         f,
-                         const void *,   b, size_t, c, unsigned, o1,
-                         long, o2)
-    LSS_INLINE _syscall4(int, _readahead,          int,         f,
-                         unsigned,       o1, unsigned, o2, size_t, c)
+    #if defined(__ARM_EABI__)
+      /* On ARM, a 64-bit parameter has to be in an even-odd register pair.
+       * Hence these calls ignore their fourth argument (r3) so that their
+       * fifth and sixth make such a pair (r4,r5).
+       */
+      #define LSS_LLARG_PAD 0,
+      LSS_INLINE _syscall6(ssize_t, _pread64,        int,         f,
+                           void *,         b, size_t, c,
+                           unsigned, skip, unsigned, o1, unsigned, o2)
+      LSS_INLINE _syscall6(ssize_t, _pwrite64,       int,         f,
+                           const void *,   b, size_t, c,
+                           unsigned, skip, unsigned, o1, unsigned, o2)
+      LSS_INLINE _syscall5(int, _readahead,          int,         f,
+                           unsigned,     skip,
+                           unsigned,       o1, unsigned, o2, size_t, c)
+    #else
+      #define LSS_LLARG_PAD
+      LSS_INLINE _syscall5(ssize_t, _pread64,        int,         f,
+                           void *,         b, size_t, c, unsigned, o1,
+                           unsigned, o2)
+      LSS_INLINE _syscall5(ssize_t, _pwrite64,       int,         f,
+                           const void *,   b, size_t, c, unsigned, o1,
+                           long, o2)
+      LSS_INLINE _syscall4(int, _readahead,          int,         f,
+                           unsigned,       o1, unsigned, o2, size_t, c)
+    #endif
     /* We force 64bit-wide parameters onto the stack, then access each
      * 32-bit component individually. This guarantees that we build the
      * correct parameters independent of the native byte-order of the
@@ -3485,20 +3503,28 @@ struct kernel_statfs {
     LSS_INLINE ssize_t LSS_NAME(pread64)(int fd, void *buf, size_t count,
                                          loff_t off) {
       union { loff_t off; unsigned arg[2]; } o = { off };
-      return LSS_NAME(_pread64)(fd, buf, count, o.arg[0], o.arg[1]);
+      return LSS_NAME(_pread64)(fd, buf, count,
+                                LSS_LLARG_PAD o.arg[0], o.arg[1]);
     }
     LSS_INLINE ssize_t LSS_NAME(pwrite64)(int fd, const void *buf,
                                           size_t count, loff_t off) {
       union { loff_t off; unsigned arg[2]; } o = { off };
-      return LSS_NAME(_pwrite64)(fd, buf, count, o.arg[0], o.arg[1]);
+      return LSS_NAME(_pwrite64)(fd, buf, count,
+                                 LSS_LLARG_PAD o.arg[0], o.arg[1]);
     }
     LSS_INLINE int LSS_NAME(readahead)(int fd, loff_t off, int len) {
       union { loff_t off; unsigned arg[2]; } o = { off };
-      return LSS_NAME(_readahead)(fd, o.arg[0], o.arg[1], len);
+      return LSS_NAME(_readahead)(fd, LSS_LLARG_PAD o.arg[0], o.arg[1], len);
     }
   #endif
 #endif
 
+#ifdef __ANDROID__
+# pragma pop_macro("stat64")
+# pragma pop_macro("fstat64")
+# pragma pop_macro("lstat64")
+#endif
+
 #if defined(__cplusplus) && !defined(SYS_CPLUSPLUS)
 }
 #endif

From f909c43c9beb8cd3b6aaf964c7bd3a9a06e31e0f Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Wed, 18 Jul 2012 15:15:17 -0400
Subject: [PATCH 056/118] Bug 765107 - Fix transformed filter drawing with
 Azure; r=bas

--HG--
extra : rebase_source : bfd4a2a16cbae25db180aed7c84991374a41730b
---
 layout/svg/base/src/nsSVGUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index 2fa21e156c6..10a4335b7cc 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -1499,7 +1499,7 @@ nsSVGUtils::CompositeSurfaceMatrix(gfxContext *aContext,
     Matrix oldMat = dt->GetTransform();
     RefPtr<SourceSurface> surf =
       gfxPlatform::GetPlatform()->GetSourceSurfaceForSurface(dt, aSurface);
-    dt->SetTransform(oldMat * ToMatrix(aCTM));
+    dt->SetTransform(ToMatrix(aCTM) * oldMat);
 
     gfxSize size = aSurface->GetSize();
     NS_ASSERTION(size.width >= 0 && size.height >= 0, "Failure to get size for aSurface.");

From ecfc76e2563b75379fb5ba70dbaba56f499b469c Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Wed, 18 Jul 2012 15:15:17 -0400
Subject: [PATCH 057/118] Bug 765107 - Reftests for scaled filter drawing;
 r=bas

--HG--
extra : rebase_source : 27fecbfc7ddb43f892401db9935236eaf00aee2d
---
 layout/reftests/svg/filter-scaled-02-ref.html | 15 +++++++++++
 layout/reftests/svg/filter-scaled-02.html     | 25 +++++++++++++++++++
 layout/reftests/svg/reftest.list              |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 layout/reftests/svg/filter-scaled-02-ref.html
 create mode 100644 layout/reftests/svg/filter-scaled-02.html

diff --git a/layout/reftests/svg/filter-scaled-02-ref.html b/layout/reftests/svg/filter-scaled-02-ref.html
new file mode 100644
index 00000000000..e0e4fa34a0a
--- /dev/null
+++ b/layout/reftests/svg/filter-scaled-02-ref.html
@@ -0,0 +1,15 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <body style="-moz-transform: scale(1.4)">
+   <div style="position: absolute; top: 20px; left: 200px">
+    <svg width="200" viewBox="0 0 222 222">
+     <rect fill="green" x="120" y="100" width="100" height="120"/>
+     <rect fill="none" stroke="black" stroke-width="4"
+           x="120" y="100" width="100" height="120"/>
+    </svg>
+   </div>
+  </body>
+</html>
diff --git a/layout/reftests/svg/filter-scaled-02.html b/layout/reftests/svg/filter-scaled-02.html
new file mode 100644
index 00000000000..a358f7e541a
--- /dev/null
+++ b/layout/reftests/svg/filter-scaled-02.html
@@ -0,0 +1,25 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <title>Test case for scaled SVG with filter region</title>
+    <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=765107 -->
+  </head>
+  <body style="-moz-transform: scale(1.4)">
+   <div style="position: absolute; top: 20px; left: 200px">
+    <svg width="200" viewBox="0 0 222 222">
+     <filter id="filter" x="-20%" width="140%">
+      <feMerge>
+        <feMergeNode/>
+      </feMerge>
+     </filter>
+     <rect fill="green" x="120" y="100" width="100" height="120"
+           filter="url(#filter)"/>
+     <rect fill="none" stroke="black" stroke-width="4"
+           x="120" y="100" width="100" height="120"/>
+    </svg>
+   </div>
+  </body>
+</html>
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 20b570cc5ed..2c157cd8364 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -137,6 +137,7 @@ fails-if(Android) == filter-extref-differentOrigin-01.svg pass.svg # Bug 695385
 == filter-in-mask-01.svg pass.svg
 == filter-invalidation-01.svg pass.svg
 == filter-scaled-01.svg pass.svg
+== filter-scaled-02.html filter-scaled-02-ref.html
 == filter-translated-01.svg filter-translated-01-ref.svg
 == filters-and-group-opacity-01.svg filters-and-group-opacity-01-ref.svg
 == foreignObject-01.svg pass.svg

From 99b30c8c9a1068510d421f2ce19706aba0217161 Mon Sep 17 00:00:00 2001
From: Dave Hylands <dhylands@gmail.com>
Date: Thu, 12 Jul 2012 13:28:14 -0700
Subject: [PATCH 058/118] Bug 773414 - Add PR_DuplicateEnvironment function.
 r=cjones

From 2236c867cfc9b25bc1327206da8b4b29a91f65e0 Mon Sep 17 00:00:00 2001
Need to reimplement PR_GetEnv and PR_SetEnv so that we can access
to the lock. This is needed by PR_DuplicateEnvironment, which
was moved to ipc/chromium/src/base/process_util_linux.cc otherwise
the alloc/frees don't get matched up properly.

This is tempoarary until we can get PR_DuplicateEnvironment landed
into NSPR.
---
 configure.in                 |    2 +-
 mozglue/build/BionicGlue.cpp |   44 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)
---
 configure.in                 |  2 +-
 mozglue/build/BionicGlue.cpp | 44 +++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 0059f249779..5a6ae4a9e84 100644
--- a/configure.in
+++ b/configure.in
@@ -7072,7 +7072,7 @@ if test "$OS_TARGET" = Android; then
         WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=dlopen,--wrap=dlclose,--wrap=dlerror,--wrap=dlsym,--wrap=dladdr"
     fi
     WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror"
-    WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=fork,--wrap=pthread_atfork,--wrap=raise"
+    WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=fork,--wrap=pthread_atfork,--wrap=raise,--wrap=PR_GetEnv,--wrap=PR_SetEnv"
 fi
 
 dnl ========================================================
diff --git a/mozglue/build/BionicGlue.cpp b/mozglue/build/BionicGlue.cpp
index 1472ee93438..cd835323dac 100644
--- a/mozglue/build/BionicGlue.cpp
+++ b/mozglue/build/BionicGlue.cpp
@@ -3,8 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include <unistd.h>
 #include <pthread.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <vector>
 
 #define NS_EXPORT __attribute__ ((visibility("default")))
@@ -59,3 +61,43 @@ __wrap_raise(int sig)
   return pthread_kill(pthread_self(), sig);
 }
 
+/*
+ * The following wrappers for PR_Xxx are needed until we can get
+ * PR_DuplicateEnvironment landed in NSPR.
+ * See see bug 772734 and bug 773414.
+ *
+ * We can't #include the pr headers here, and we can't call any of the
+ * PR/PL functions either, so we just reimplemnt using native code.
+ */
+
+static pthread_mutex_t  _pr_envLock = PTHREAD_MUTEX_INITIALIZER;
+
+extern "C" NS_EXPORT char*
+__wrap_PR_GetEnv(const char *var)
+{
+    char *ev;
+
+    pthread_mutex_lock(&_pr_envLock);
+    ev = getenv(var);
+    pthread_mutex_unlock(&_pr_envLock);
+    return ev;
+}
+
+extern "C" NS_EXPORT int
+__wrap_PR_SetEnv(const char *string)
+{
+    int result;
+
+    if ( !strchr(string, '=')) return(-1);
+
+    pthread_mutex_lock(&_pr_envLock);
+    result = putenv(string);
+    pthread_mutex_unlock(&_pr_envLock);
+    return (result)? -1 : 0;
+}
+
+extern "C" NS_EXPORT pthread_mutex_t *
+PR_GetEnvLock(void)
+{
+  return &_pr_envLock;
+}

From b5b5b42198a4923b892b469d1cf4c3ef829e7ddd Mon Sep 17 00:00:00 2001
From: Dave Hylands <dhylands@gmail.com>
Date: Fri, 13 Jul 2012 08:41:30 -0700
Subject: [PATCH 059/118] Bug 772734 - Fixes LaunchApp hang when launching.
 r=cjones

From 8010cffba6e3dec5f792e965aacb9621ef06e0d7 Mon Sep 17 00:00:00 2001
 plugin-container - v5
Added checks in case PR_DuplicateEnvironment or PR_Malloc fail
Added #ifdef so that only Android builds try to call PR_DuplicateEnvironment
Moved PR_DuplicateEnvironment function from mozglue into process_util_linux.cc
so that matched alloc/free calls happen under android.
---
 ipc/chromium/src/base/process_util_linux.cc |  146 +++++++++++++++++++++++++--
 1 file changed, 140 insertions(+), 6 deletions(-)
---
 ipc/chromium/src/base/process_util_linux.cc | 146 +++++++++++++++++++-
 1 file changed, 140 insertions(+), 6 deletions(-)

diff --git a/ipc/chromium/src/base/process_util_linux.cc b/ipc/chromium/src/base/process_util_linux.cc
index cf420763c73..1b013fe8be9 100644
--- a/ipc/chromium/src/base/process_util_linux.cc
+++ b/ipc/chromium/src/base/process_util_linux.cc
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <memory>
 #include <unistd.h>
 #include <string>
 #include <sys/types.h>
@@ -19,6 +20,20 @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 
+#ifdef ANDROID
+#include <pthread.h>
+/*
+ * Currently, PR_DuplicateEnvironment is implemented in mozglue/build/BionicGlue.cpp
+ */
+#define HAVE_PR_DUPLICATE_ENVIRONMENT
+
+#include "plstr.h"
+#include "prenv.h"
+#include "prmem.h"
+/* Temporary until we have PR_DuplicateEnvironment in prenv.h */
+extern "C" { NSPR_API(pthread_mutex_t *)PR_GetEnvLock(void); }
+#endif
+
 namespace {
 
 enum ParsingState {
@@ -32,6 +47,111 @@ static mozilla::EnvironmentLog gProcessLog("MOZ_PROCESS_LOG");
 
 namespace base {
 
+#ifdef HAVE_PR_DUPLICATE_ENVIRONMENT
+/* 
+ * I tried to put PR_DuplicateEnvironment down in mozglue, but on android 
+ * this winds up failing because the strdup/free calls wind up mismatching. 
+ */
+
+static char **
+PR_DuplicateEnvironment(void)
+{
+    char **result = NULL;
+    char **s;
+    char **d;
+    pthread_mutex_lock(PR_GetEnvLock());
+    for (s = environ; *s != NULL; s++)
+      ;
+    if ((result = (char **)PR_Malloc(sizeof(char *) * (s - environ + 1))) != NULL) {
+      for (s = environ, d = result; *s != NULL; s++, d++) {
+        *d = PL_strdup(*s);
+      }
+      *d = NULL;
+    }
+    pthread_mutex_unlock(PR_GetEnvLock());
+    return result;
+}
+
+class EnvironmentEnvp
+{
+public:
+  EnvironmentEnvp()
+    : mEnvp(PR_DuplicateEnvironment()) {}
+
+  EnvironmentEnvp(const environment_map &em)
+  {
+    mEnvp = (char **)PR_Malloc(sizeof(char *) * (em.size() + 1));
+    if (!mEnvp) {
+      return;
+    }
+    char **e = mEnvp;
+    for (environment_map::const_iterator it = em.begin();
+         it != em.end(); ++it, ++e) {
+      std::string str = it->first;
+      str += "=";
+      str += it->second;
+      *e = PL_strdup(str.c_str());
+    }
+    *e = NULL;
+  }
+
+  ~EnvironmentEnvp()
+  {
+    if (!mEnvp) {
+      return;
+    }
+    for (char **e = mEnvp; *e; ++e) {
+      PL_strfree(*e);
+    }
+    PR_Free(mEnvp);
+  }
+
+  char * const *AsEnvp() { return mEnvp; }
+
+  void ToMap(environment_map &em)
+  {
+    if (!mEnvp) {
+      return;
+    }
+    em.clear();
+    for (char **e = mEnvp; *e; ++e) {
+      const char *eq;
+      if ((eq = strchr(*e, '=')) != NULL) {
+        std::string varname(*e, eq - *e);
+        em[varname.c_str()] = &eq[1];
+      }
+    }
+  }
+
+private:
+  char **mEnvp;
+};
+
+class Environment : public environment_map
+{
+public:
+  Environment()
+  {
+    EnvironmentEnvp envp;
+    envp.ToMap(*this);
+  }
+
+  char * const *AsEnvp() {
+    mEnvp.reset(new EnvironmentEnvp(*this));
+    return mEnvp->AsEnvp();
+  }
+
+  void Merge(const environment_map &em)
+  {
+    for (const_iterator it = em.begin(); it != em.end(); ++it) {
+      (*this)[it->first] = it->second;
+    }
+  }
+private:
+  std::auto_ptr<EnvironmentEnvp> mEnvp;
+};
+#endif // HAVE_PR_DUPLICATE_ENVIRONMENT
+
 bool LaunchApp(const std::vector<std::string>& argv,
                const file_handle_mapping_vector& fds_to_remap,
                bool wait, ProcessHandle* process_handle) {
@@ -50,6 +170,16 @@ bool LaunchApp(const std::vector<std::string>& argv,
   fd_shuffle1.reserve(fds_to_remap.size());
   fd_shuffle2.reserve(fds_to_remap.size());
 
+#ifdef HAVE_PR_DUPLICATE_ENVIRONMENT
+  Environment env;
+  env.Merge(env_vars_to_set);
+  char * const *envp = env.AsEnvp();
+  if (!envp) {
+    DLOG(ERROR) << "FAILED to duplicate environment for: " << argv_cstr[0];
+    return false;
+  }
+#endif
+
   pid_t pid = fork();
   if (pid < 0)
     return false;
@@ -66,19 +196,23 @@ bool LaunchApp(const std::vector<std::string>& argv,
 
     CloseSuperfluousFds(fd_shuffle2);
 
+    for (size_t i = 0; i < argv.size(); i++)
+      argv_cstr[i] = const_cast<char*>(argv[i].c_str());
+    argv_cstr[argv.size()] = NULL;
+
+#ifdef HAVE_PR_DUPLICATE_ENVIRONMENT
+    execve(argv_cstr[0], argv_cstr.get(), envp);
+#else
     for (environment_map::const_iterator it = env_vars_to_set.begin();
          it != env_vars_to_set.end(); ++it) {
       if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
         _exit(127);
     }
-
-    for (size_t i = 0; i < argv.size(); i++)
-      argv_cstr[i] = const_cast<char*>(argv[i].c_str());
-    argv_cstr[argv.size()] = NULL;
-    execvp(argv_cstr[0], argv_cstr.get());
+    execv(argv_cstr[0], argv_cstr.get());
+#endif
     // if we get here, we're in serious trouble and should complain loudly
     DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
-    exit(127);
+    _exit(127);
   } else {
     gProcessLog.print("==> process %d launched child process %d\n",
                       GetCurrentProcId(), pid);

From 925bae17d195248ec9c7646ca6ef47e1ab176cfc Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Wed, 18 Jul 2012 22:45:58 -0400
Subject: [PATCH 060/118] Bug 774813 - Bug 774139 will break Qt builds due to
 #define signals. r=cjones

---
 dom/plugins/ipc/NestedLoopTimer.h      | 2 ++
 dom/plugins/ipc/PluginModuleParent.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dom/plugins/ipc/NestedLoopTimer.h b/dom/plugins/ipc/NestedLoopTimer.h
index f33371e1905..06136badb55 100644
--- a/dom/plugins/ipc/NestedLoopTimer.h
+++ b/dom/plugins/ipc/NestedLoopTimer.h
@@ -36,4 +36,6 @@ private:
 } /* namespace plugins */
 } /* namespace mozilla */
 
+#undef slots
+
 #endif
diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp
index 25fba2dcc64..80cc424b47f 100644
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -13,6 +13,7 @@
 #ifdef MOZ_WIDGET_QT
 #include <QtCore/QCoreApplication>
 #include <QtCore/QEventLoop>
+#include "NestedLoopTimer.h"
 #endif
 
 #include "base/process_util.h"

From 33a6ecb3a2fab78c74cac1cea65b77318c51d1b7 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <oleg.romashin@nokia.com>
Date: Wed, 18 Jul 2012 22:46:11 -0400
Subject: [PATCH 061/118] Bug 775257 - Gstreamer backend on Meego N9 produce
 extra noise in audio playback.r=giles

---
 content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/content/media/gstreamer/nsGStreamerReader.cpp b/content/media/gstreamer/nsGStreamerReader.cpp
index c48f92ed58e..0fb801a788f 100644
--- a/content/media/gstreamer/nsGStreamerReader.cpp
+++ b/content/media/gstreamer/nsGStreamerReader.cpp
@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor)
   gst_object_unref(sinkpad);
 
   mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
+#ifdef MOZ_SAMPLE_TYPE_FLOAT32
         "appsink name=audiosink sync=true caps=audio/x-raw-float,"
         "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL);
+#else
+        "appsink name=audiosink sync=true caps=audio/x-raw-int,"
+        "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL);
+#endif
   mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
         "audiosink"));
   gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks,

From 2eb58242da611f72176288c8591d8926c960fef2 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 18 Jul 2012 08:34:56 +0200
Subject: [PATCH 062/118] Bug 774772 - Fix webapprt l10n after bug 762864.
 r=bsmedberg

--HG--
extra : transplant_source : %17%9D%F6%99%D8%1Fx%26%B6q%F3F%A7%89%0C%03%AF%E2%C5%3C
---
 toolkit/locales/l10n.mk               | 3 +++
 toolkit/mozapps/installer/packager.mk | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
index 5f54b9efa01..dc754d57332 100644
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -120,6 +120,9 @@ repackage-zip:  libs-$(AB_CD)
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
 	  tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
 	mv $(STAGEDIST)/chrome/$(AB_CD).manifest $(STAGEDIST)/chrome/localized.manifest
+ifdef MOZ_WEBAPP_RUNTIME
+	mv $(STAGEDIST)/webapprt/chrome/$(AB_CD).manifest $(STAGEDIST)/webapprt/chrome/localized.manifest
+endif
 ifneq (en,$(AB))
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/$(AB).lproj
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index cf2ef3d5ab6..c01daf00bc2 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -786,6 +786,10 @@ endif
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
 	  $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
 	  $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+ifdef MOZ_WEBAPP_RUNTIME
+	mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
+	sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+endif
 	printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
 else # !MOZ_PKG_MANIFEST
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)

From 4e94797ac077f430bf19c5aca89e0e633305835a Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 19 Jul 2012 10:43:33 +0300
Subject: [PATCH 063/118] Bug 770429, do uri load check earlier to avoid
 running code unnecessarily, r=mrbkap

--HG--
extra : rebase_source : f28bd4edb4c055f5674923ffb82bae20bc502dd2
---
 dom/base/nsLocation.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp
index 7ff0ee6629e..8f6d0d67a97 100644
--- a/dom/base/nsLocation.cpp
+++ b/dom/base/nsLocation.cpp
@@ -37,6 +37,7 @@
 #include "nsITextToSubURI.h"
 #include "nsJSUtils.h"
 #include "jsfriendapi.h"
+#include "nsContentUtils.h"
 
 static nsresult
 GetContextFromStack(nsIJSContextStack *aStack, JSContext **aContext)
@@ -168,6 +169,14 @@ nsresult
 nsLocation::CheckURL(nsIURI* aURI, nsIDocShellLoadInfo** aLoadInfo)
 {
   *aLoadInfo = nsnull;
+  JSContext* cx;
+  if ((cx = nsContentUtils::GetCurrentJSContext())) {
+    nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
+    NS_ENSURE_STATE(ssm);
+    // Check to see if URI is allowed.
+    nsresult rv = ssm->CheckLoadURIFromScript(cx, aURI);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mDocShell));
   NS_ENSURE_TRUE(docShell, NS_ERROR_NOT_AVAILABLE);
@@ -178,8 +187,6 @@ nsLocation::CheckURL(nsIURI* aURI, nsIDocShellLoadInfo** aLoadInfo)
     stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  JSContext *cx;
-
   NS_ENSURE_SUCCESS(GetContextFromStack(stack, &cx), NS_ERROR_FAILURE);
 
   nsCOMPtr<nsISupports> owner;

From ea0631cee74773090ae5ac82bf54770ed4f1a846 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Sat, 14 Jul 2012 14:28:35 +0300
Subject: [PATCH 064/118] Bug 773945, remove nsXULElement::mPrototype, part 1,
 r=bz

---
 content/events/src/nsEventListenerManager.cpp |  68 +++-----
 content/xul/content/src/nsXULElement.cpp      | 151 ------------------
 content/xul/content/src/nsXULElement.h        |   3 -
 dom/base/Makefile.in                          |   1 -
 dom/base/nsDOMClassInfo.cpp                   |   1 -
 dom/base/nsIScriptEventHandlerOwner.h         |  64 --------
 6 files changed, 21 insertions(+), 267 deletions(-)
 delete mode 100644 dom/base/nsIScriptEventHandlerOwner.h

diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index c260cc92b67..9064fd9f66f 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -40,7 +40,6 @@
 #include "nsMutationEvent.h"
 #include "nsIXPConnect.h"
 #include "nsDOMCID.h"
-#include "nsIScriptEventHandlerOwner.h"
 #include "nsFocusManager.h"
 #include "nsIDOMElement.h"
 #include "nsContentUtils.h"
@@ -662,21 +661,8 @@ nsEventListenerManager::CompileEventHandlerInternal(nsListenerStruct *aListenerS
   NS_ASSERTION(!listener->GetHandler(), "What is there to compile?");
 
   nsIScriptContext *context = listener->GetEventContext();
-  nsCOMPtr<nsIScriptEventHandlerOwner> handlerOwner =
-    do_QueryInterface(mTarget);
   nsScriptObjectHolder<JSObject> handler(context);
 
-  if (handlerOwner) {
-    result = handlerOwner->GetCompiledEventHandler(aListenerStruct->mTypeAtom,
-                                                   handler);
-    if (NS_SUCCEEDED(result) && handler) {
-      aListenerStruct->mHandlerIsString = false;
-    } else {
-      // Make sure there's nothing in the holder in the failure case
-      handler.set(nsnull);
-    }
-  }
-
   if (aListenerStruct->mHandlerIsString) {
     // OK, we didn't find an existing compiled event handler.  Flag us
     // as not a string so we don't keep trying to compile strings
@@ -745,41 +731,29 @@ nsEventListenerManager::CompileEventHandlerInternal(nsListenerStruct *aListenerS
       return NS_ERROR_FAILURE;
     }
 
+    PRUint32 argCount;
+    const char **argNames;
+    // If no content, then just use kNameSpaceID_None for the
+    // namespace ID.  In practice, it doesn't matter since SVG is
+    // the only thing with weird arg names and SVG doesn't map event
+    // listeners to the window.
+    nsContentUtils::GetEventArgNames(content ?
+                                       content->GetNameSpaceID() :
+                                       kNameSpaceID_None,
+                                     aListenerStruct->mTypeAtom,
+                                     &argCount, &argNames);
 
-    if (handlerOwner) {
-      // Always let the handler owner compile the event
-      // handler, as it may want to use a special
-      // context or scope object.
-      result = handlerOwner->CompileEventHandler(context,
-                                                 aListenerStruct->mTypeAtom,
-                                                 *body,
-                                                 url.get(), lineNo,
-                                                 handler);
-    } else {
-      PRUint32 argCount;
-      const char **argNames;
-      // If no content, then just use kNameSpaceID_None for the
-      // namespace ID.  In practice, it doesn't matter since SVG is
-      // the only thing with weird arg names and SVG doesn't map event
-      // listeners to the window.
-      nsContentUtils::GetEventArgNames(content ?
-                                         content->GetNameSpaceID() :
-                                         kNameSpaceID_None,
-                                       aListenerStruct->mTypeAtom,
-                                       &argCount, &argNames);
-
-      result = context->CompileEventHandler(aListenerStruct->mTypeAtom,
-                                            argCount, argNames,
-                                            *body,
-                                            url.get(), lineNo,
-                                            SCRIPTVERSION_DEFAULT, // for now?
-                                            handler);
-      if (result == NS_ERROR_ILLEGAL_VALUE) {
-        NS_WARNING("Probably a syntax error in the event handler!");
-        return NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA;
-      }
-      NS_ENSURE_SUCCESS(result, result);
+    result = context->CompileEventHandler(aListenerStruct->mTypeAtom,
+                                          argCount, argNames,
+                                          *body,
+                                          url.get(), lineNo,
+                                          SCRIPTVERSION_DEFAULT, // for now?
+                                          handler);
+    if (result == NS_ERROR_ILLEGAL_VALUE) {
+      NS_WARNING("Probably a syntax error in the event handler!");
+      return NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA;
     }
+    NS_ENSURE_SUCCESS(result, result);
   }
 
   if (handler) {
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 7ea53b6e3a8..7012ab8c9e2 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -104,32 +104,6 @@
 
 namespace css = mozilla::css;
 
-/**
- * A tearoff class for nsXULElement to implement nsIScriptEventHandlerOwner.
- */
-class nsScriptEventHandlerOwnerTearoff MOZ_FINAL : public nsIScriptEventHandlerOwner
-{
-public:
-    nsScriptEventHandlerOwnerTearoff(nsXULElement* aElement)
-    : mElement(aElement) {}
-
-    NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-    NS_DECL_CYCLE_COLLECTION_CLASS(nsScriptEventHandlerOwnerTearoff)
-
-    // nsIScriptEventHandlerOwner
-    virtual nsresult CompileEventHandler(nsIScriptContext* aContext,
-                                         nsIAtom *aName,
-                                         const nsAString& aBody,
-                                         const char* aURL,
-                                         PRUint32 aLineNo,
-                                         nsScriptObjectHolder<JSObject>& aHandler);
-    virtual nsresult GetCompiledEventHandler(nsIAtom *aName,
-                                             nsScriptObjectHolder<JSObject>& aHandler);
-
-private:
-    nsRefPtr<nsXULElement> mElement;
-};
-
 //----------------------------------------------------------------------
 
 static NS_DEFINE_CID(kXULPopupListenerCID,        NS_XULPOPUPLISTENER_CID);
@@ -350,8 +324,6 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsXULElement)
         NS_INTERFACE_TABLE_ENTRY(nsXULElement, nsIDOMXULElement)
     NS_OFFSET_AND_INTERFACE_TABLE_END
     NS_ELEMENT_INTERFACE_TABLE_TO_MAP_SEGUE
-    NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIScriptEventHandlerOwner,
-                                   new nsScriptEventHandlerOwnerTearoff(this))
     NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMElementCSSInlineStyle,
                                    new nsXULElementTearoff(this))
     NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIFrameLoaderOwner,
@@ -643,130 +615,7 @@ nsXULElement::PerformAccesskey(bool aKeyCausesActivation,
     }
 }
 
-
 //----------------------------------------------------------------------
-// nsIScriptEventHandlerOwner interface
-
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsScriptEventHandlerOwnerTearoff)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsScriptEventHandlerOwnerTearoff)
-  tmp->mElement = nsnull;
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsScriptEventHandlerOwnerTearoff)
-  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mElement");
-  cb.NoteXPCOMChild(static_cast<nsIContent*>(tmp->mElement));
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsScriptEventHandlerOwnerTearoff)
-  NS_INTERFACE_MAP_ENTRY(nsIScriptEventHandlerOwner)
-NS_INTERFACE_MAP_END_AGGREGATED(mElement)
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsScriptEventHandlerOwnerTearoff)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsScriptEventHandlerOwnerTearoff)
-
-nsresult
-nsScriptEventHandlerOwnerTearoff::GetCompiledEventHandler(
-                                                nsIAtom *aName,
-                                                nsScriptObjectHolder<JSObject>& aHandler)
-{
-    XUL_PROTOTYPE_ATTRIBUTE_METER(gNumCacheTests);
-    aHandler.drop();
-
-    nsXULPrototypeAttribute *attr =
-        mElement->FindPrototypeAttribute(kNameSpaceID_None, aName);
-    if (attr) {
-        XUL_PROTOTYPE_ATTRIBUTE_METER(gNumCacheHits);
-        aHandler.set(attr->mEventHandler);
-    }
-
-    return NS_OK;
-}
-
-nsresult
-nsScriptEventHandlerOwnerTearoff::CompileEventHandler(
-                                                nsIScriptContext* aContext,
-                                                nsIAtom *aName,
-                                                const nsAString& aBody,
-                                                const char* aURL,
-                                                PRUint32 aLineNo,
-                                                nsScriptObjectHolder<JSObject>& aHandler)
-{
-    nsresult rv;
-
-    XUL_PROTOTYPE_ATTRIBUTE_METER(gNumCacheSets);
-
-    // XXX sXBL/XBL2 issue! Owner or current document?
-    nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(mElement->OwnerDoc());
-
-    nsIScriptContext* context = NULL;
-    nsXULPrototypeElement* elem = mElement->mPrototype;
-    if (elem && xuldoc) {
-        // It'll be shared among the instances of the prototype.
-
-        // Use the prototype document's special context.  Because
-        // scopeObject is null, the JS engine has no other source of
-        // <the-new-shared-event-handler>.__proto__ than to look in
-        // cx->globalObject for Function.prototype.  That prototype
-        // keeps the global object alive, so if we use this document's
-        // global object, we'll be putting something in the prototype
-        // that protects this document's global object from GC.
-        nsCOMPtr<nsIScriptGlobalObjectOwner> globalOwner;
-        rv = xuldoc->GetScriptGlobalObjectOwner(getter_AddRefs(globalOwner));
-        NS_ENSURE_SUCCESS(rv, rv);
-        NS_ENSURE_TRUE(globalOwner, NS_ERROR_UNEXPECTED);
-
-        nsIScriptGlobalObject* global = globalOwner->GetScriptGlobalObject();
-        NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
-
-        context = global->GetScriptContext();
-        // It could be possible the language has been setup on aContext but
-        // not on the global - we don't demand-create language contexts on the
-        // nsGlobalWindow
-        NS_ASSERTION(context,
-                     "Failed to get a language context from the global!?");
-        NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
-    }
-    else {
-        context = aContext;
-    }
-
-    // Compile the event handler
-    PRUint32 argCount;
-    const char **argNames;
-    nsContentUtils::GetEventArgNames(kNameSpaceID_XUL, aName, &argCount,
-                                     &argNames);
-
-    nsCxPusher pusher;
-    if (!pusher.Push(context->GetNativeContext())) {
-      return NS_ERROR_FAILURE;
-    }
-
-    rv = context->CompileEventHandler(aName, argCount, argNames,
-                                      aBody, aURL, aLineNo,
-                                      SCRIPTVERSION_DEFAULT,  // for now?
-                                      aHandler);
-    if (NS_FAILED(rv)) return rv;
-
-    nsXULPrototypeAttribute *attr =
-        mElement->FindPrototypeAttribute(kNameSpaceID_None, aName);
-    if (attr) {
-        XUL_PROTOTYPE_ATTRIBUTE_METER(gNumCacheFills);
-        // take a copy of the event handler, and tell the language about it.
-        if (aHandler) {
-            NS_ASSERTION(!attr->mEventHandler, "Leaking handler.");
-
-            if (!elem->mHoldsScriptObject) {
-                rv = nsContentUtils::HoldJSObjects(
-                    elem, NS_CYCLE_COLLECTION_PARTICIPANT(nsXULPrototypeNode));
-                NS_ENSURE_SUCCESS(rv, rv);
-            }
-
-            elem->mHoldsScriptObject = true;
-        }
-        attr->mEventHandler = aHandler.get();
-    }
-
-    return NS_OK;
-}
 
 void
 nsXULElement::AddListenerFor(const nsAttrName& aName,
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index a89f5db11b0..7936370c1e3 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -25,7 +25,6 @@
 #include "nsEventListenerManager.h"
 #include "nsIRDFCompositeDataSource.h"
 #include "nsIRDFResource.h"
-#include "nsIScriptEventHandlerOwner.h"
 #include "nsBindingManager.h"
 #include "nsIURI.h"
 #include "nsIXULTemplateBuilder.h"
@@ -617,8 +616,6 @@ protected:
     Create(nsXULPrototypeElement* aPrototype, nsINodeInfo *aNodeInfo,
            bool aIsScriptable);
 
-    friend class nsScriptEventHandlerOwnerTearoff;
-
     bool IsReadWriteTextElement() const
     {
         const nsIAtom* tag = Tag();
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
index ad87f9ec459..632d2b3474c 100644
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -56,7 +56,6 @@ EXPORTS = \
   nsIScriptGlobalObject.h \
   nsIScriptGlobalObjectOwner.h \
   nsIScriptNameSpaceManager.h \
-  nsIScriptEventHandlerOwner.h \
   nsIScriptObjectPrincipal.h \
   nsIScriptRuntime.h \
   nsIScriptTimeoutHandler.h \
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index a62055b4dbc..2fb55f06ac4 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -85,7 +85,6 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsScriptNameSpaceManager.h"
-#include "nsIScriptEventHandlerOwner.h"
 #include "nsIJSNativeInitializer.h"
 #include "nsJSEnvironment.h"
 
diff --git a/dom/base/nsIScriptEventHandlerOwner.h b/dom/base/nsIScriptEventHandlerOwner.h
deleted file mode 100644
index 28b91f567b8..00000000000
--- a/dom/base/nsIScriptEventHandlerOwner.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsIScriptEventHandlerOwner_h__
-#define nsIScriptEventHandlerOwner_h__
-
-#include "nsISupports.h"
-#include "nsIScriptContext.h"
-#include "nsAString.h"
-
-template<class> class nsScriptObjectHolder;
-
-class nsIAtom;
-
-#define NS_ISCRIPTEVENTHANDLEROWNER_IID \
-{ 0xc8f35f71, 0x07d1, 0x4ff3, \
-  { 0xa3, 0x2f, 0x65, 0xcb, 0x35, 0x64, 0xac, 0xe0 } }
-
-/**
- * Associate a compiled event handler with its target object, which owns it
- * This is an adjunct to nsIScriptObjectOwner that nsEventListenerManager's
- * implementation queries for, in order to avoid recompiling a recurrent or
- * prototype-inherited event handler.
- */
-class nsIScriptEventHandlerOwner : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTEVENTHANDLEROWNER_IID)
-
-  /**
-   * Compile the specified event handler.  This does NOT bind it to
-   * anything.  That's the caller's responsibility.
-   *
-   * @param aContext the context to use when creating event handler
-   * @param aName the name of the handler
-   * @param aBody the handler script body
-   * @param aURL the URL or filename for error messages
-   * @param aLineNo the starting line number of the script for error messages
-   * @param aHandler the holder for the compiled handler object
-   */
-  virtual nsresult CompileEventHandler(nsIScriptContext* aContext,
-                                       nsIAtom *aName,
-                                       const nsAString& aBody,
-                                       const char* aURL,
-                                       PRUint32 aLineNo,
-                                       nsScriptObjectHolder<JSObject>& aHandler) = 0;
-
-  /**
-   * Retrieve an already-compiled event handler that can be bound to a
-   * target object using a script context.
-   *
-   * @param aName the name of the event handler to retrieve
-   * @param aHandler the holder for the compiled event handler.
-   */
-  virtual nsresult GetCompiledEventHandler(nsIAtom *aName,
-                                           nsScriptObjectHolder<JSObject>& aHandler) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptEventHandlerOwner,
-                              NS_ISCRIPTEVENTHANDLEROWNER_IID)
-
-#endif // nsIScriptEventHandlerOwner_h__

From 6e7dc0fe0d8466c7b0607c3a6994231ac9e39db1 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 19 Jul 2012 11:31:47 +0300
Subject: [PATCH 065/118] Bug 773945, remove nsXULElement::mPrototype, part 2,
 r=bz

---
 content/base/public/nsIDocument.h      | 10 ++++++++++
 content/base/src/nsDocument.h          |  5 -----
 content/base/src/nsNodeUtils.cpp       |  3 +--
 content/xul/content/src/nsXULElement.h |  3 ---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index e8a1053709d..a9ba8ff9872 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -1205,6 +1205,11 @@ public:
     return mLoadedAsData;
   }
 
+  bool IsLoadedAsInteractiveData()
+  {
+    return mLoadedAsInteractiveData;
+  }
+
   bool MayStartLayout()
   {
     return mMayStartLayout;
@@ -1799,6 +1804,11 @@ protected:
   // as scripts and plugins, disabled.
   bool mLoadedAsData;
 
+  // This flag is only set in nsXMLDocument, for e.g. documents used in XBL. We
+  // don't want animations to play in such documents, so we need to store the
+  // flag here so that we can check it in nsDocument::GetAnimationController.
+  bool mLoadedAsInteractiveData;
+
   // If true, whoever is creating the document has gotten it to the
   // point where it's safe to start layout on it.
   bool mMayStartLayout;
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index 49d54697d85..7bfff7d353a 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -1173,11 +1173,6 @@ protected:
 
   bool mInXBLUpdate:1;
 
-  // This flag is only set in nsXMLDocument, for e.g. documents used in XBL. We
-  // don't want animations to play in such documents, so we need to store the
-  // flag here so that we can check it in nsDocument::GetAnimationController.
-  bool mLoadedAsInteractiveData:1;
-
   // Whether we're currently holding a lock on all of our images.
   bool mLockingImages:1;
 
diff --git a/content/base/src/nsNodeUtils.cpp b/content/base/src/nsNodeUtils.cpp
index 39b9598526b..6d4e2aeae34 100644
--- a/content/base/src/nsNodeUtils.cpp
+++ b/content/base/src/nsNodeUtils.cpp
@@ -575,8 +575,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
 #ifdef MOZ_XUL
   if (aClone && !aParent && aNode->IsElement() &&
       aNode->AsElement()->IsXUL()) {
-    nsXULElement *xulElem = static_cast<nsXULElement*>(elem);
-    if (!xulElem->mPrototype || xulElem->IsInDoc()) {
+    if (!aNode->OwnerDoc()->IsLoadedAsInteractiveData()) {
       clone->SetFlags(NODE_FORCE_XBL_BINDINGS);
     }
   }
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index 7936370c1e3..9d8fb580ff7 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -500,9 +500,6 @@ public:
 
     virtual nsIDOMNode* AsDOMNode() { return this; }
 protected:
-    // XXX This can be removed when nsNodeUtils::CloneAndAdopt doesn't need
-    //     access to mPrototype anymore.
-    friend class nsNodeUtils;
 
     // This can be removed if EnsureContentsGenerated dies.
     friend class nsNSElementTearoff;

From 5df5edb994a6a419deb2dfccb265d77126891dc3 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Sat, 14 Jul 2012 18:28:54 +0300
Subject: [PATCH 066/118] Bug 773945, remove nsXULElement::mPrototype, part 3,
 r=bz

---
 content/base/src/nsGenericElement.cpp    |  23 +-
 content/base/src/nsStyledElement.cpp     |   9 -
 content/xul/content/src/nsXULElement.cpp | 444 +----------------------
 content/xul/content/src/nsXULElement.h   |  46 +--
 4 files changed, 22 insertions(+), 500 deletions(-)

diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 41e3419345d..7b97e2c3d04 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -1536,21 +1536,6 @@ nsresult
 nsGenericElement::GetAttribute(const nsAString& aName,
                                nsAString& aReturn)
 {
-  // I hate XUL
-  if (IsXUL()) {
-    const nsAttrValue* val =
-      nsXULElement::FromContent(this)->GetAttrValue(aName);
-    if (val) {
-      val->ToString(aReturn);
-    }
-    else {
-      // XXX should be SetDOMStringToNull(aReturn);
-      // See bug 232598
-      aReturn.Truncate();
-    }
-    return NS_OK;
-  }
-  
   const nsAttrValue* val =
     mAttrsAndChildren.GetAttr(aName,
                               IsHTML() && IsInHTMLDocument() ?
@@ -1558,7 +1543,13 @@ nsGenericElement::GetAttribute(const nsAString& aName,
   if (val) {
     val->ToString(aReturn);
   } else {
-    SetDOMStringToNull(aReturn);
+    if (IsXUL()) {
+      // XXX should be SetDOMStringToNull(aReturn);
+      // See bug 232598
+      aReturn.Truncate();
+    } else {
+      SetDOMStringToNull(aReturn);
+    }
   }
 
   return NS_OK;
diff --git a/content/base/src/nsStyledElement.cpp b/content/base/src/nsStyledElement.cpp
index 122d1a0708b..4cdf2b1d43a 100644
--- a/content/base/src/nsStyledElement.cpp
+++ b/content/base/src/nsStyledElement.cpp
@@ -193,15 +193,6 @@ nsStyledElementNotElementCSSInlineStyle::GetInlineStyleRule()
 nsIDOMCSSStyleDeclaration*
 nsStyledElementNotElementCSSInlineStyle::GetStyle(nsresult* retval)
 {
-  nsXULElement* xulElement = nsXULElement::FromContent(this);
-  if (xulElement) {
-    nsresult rv = xulElement->EnsureLocalStyle();
-    if (NS_FAILED(rv)) {
-      *retval = rv;
-      return nsnull;
-    }
-  }
-    
   nsGenericElement::nsDOMSlots *slots = DOMSlots();
 
   if (!slots->mStyle) {
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 7012ab8c9e2..a821c86bf38 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -209,7 +209,6 @@ nsXULElement::Create(nsXULPrototypeElement* aPrototype, nsINodeInfo *aNodeInfo,
     if (element) {
         NS_ADDREF(element);
 
-        element->mPrototype = aPrototype;
         if (aPrototype->mHasIdAttribute) {
             element->SetHasID();
         }
@@ -220,6 +219,7 @@ nsXULElement::Create(nsXULPrototypeElement* aPrototype, nsINodeInfo *aNodeInfo,
             element->SetMayHaveStyle();
         }
 
+        element->MakeHeavyweight(aPrototype);
         if (aIsScriptable) {
             // Check each attribute on the prototype to see if we need to do
             // any additional processing and hookup that would otherwise be
@@ -267,7 +267,7 @@ nsXULElement::Create(nsXULPrototypeElement* aPrototype,
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    NS_ADDREF(*aResult = element.get());
+    element.forget(aResult);
 
     return NS_OK;
 }
@@ -303,7 +303,6 @@ NS_TrustedNewXULElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNod
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULElement)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULElement,
                                                   nsStyledElement)
-    NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPrototype)
     {
         nsXULSlots* slots = static_cast<nsXULSlots*>(tmp->GetExistingSlots());
         if (slots) {
@@ -339,19 +338,8 @@ nsXULElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
 {
     *aResult = nsnull;
 
-    // If we have a prototype, so will our clone.
-    nsRefPtr<nsXULElement> element;
-    if (mPrototype) {
-        element = nsXULElement::Create(mPrototype, aNodeInfo, true);
-    }
-    else {
-        nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
-        element = new nsXULElement(ni.forget());
-    }
-
-    if (!element) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
+    nsCOMPtr<nsINodeInfo> ni = aNodeInfo;
+    nsRefPtr<nsXULElement> element = new nsXULElement(ni.forget());
 
     // XXX TODO: set up RDF generic builder n' stuff if there is a
     // 'datasources' attribute? This is really kind of tricky,
@@ -362,7 +350,7 @@ nsXULElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
 
     nsresult rv = const_cast<nsXULElement*>(this)->CopyInnerTo(element);
     if (NS_SUCCEEDED(rv)) {
-        NS_ADDREF(*aResult = element);
+        element.forget(aResult);
     }
 
     return rv;
@@ -851,10 +839,8 @@ nsXULElement::BeforeSetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
 {
     if (aNamespaceID == kNameSpaceID_None && aName == nsGkAtoms::accesskey &&
         IsInDoc()) {
-        const nsAttrValue* attrVal = FindLocalOrProtoAttr(aNamespaceID, aName);
-        if (attrVal) {
-            nsAutoString oldValue;
-            attrVal->ToString(oldValue);
+        nsAutoString oldValue;
+        if (GetAttr(aNamespaceID, aName, oldValue)) {
             UnregisterAccessKey(oldValue);
         }
     } 
@@ -987,133 +973,6 @@ nsXULElement::ParseAttribute(PRInt32 aNamespaceID,
     return true;
 }
 
-const nsAttrName*
-nsXULElement::InternalGetExistingAttrNameFromQName(const nsAString& aStr) const
-{
-    const nsAttrName* attrName =
-        mAttrsAndChildren.GetExistingAttrNameFromQName(aStr);
-    if (attrName) {
-        return attrName;
-    }
-
-    if (mPrototype) {
-        PRUint32 i;
-        for (i = 0; i < mPrototype->mNumAttributes; ++i) {
-            attrName = &mPrototype->mAttributes[i].mName;
-            if (attrName->QualifiedNameEquals(aStr)) {
-                return attrName;
-            }
-        }
-    }
-
-    return nsnull;
-}
-
-const nsAttrValue*
-nsXULElement::GetAttrValue(const nsAString& aName)
-{
-  const nsAttrValue* val =
-      mAttrsAndChildren.GetAttr(aName, eCaseMatters);
-  if (val) {
-      return val;
-  }
-
-  if (mPrototype) {
-      PRUint32 i, count = mPrototype->mNumAttributes;
-      for (i = 0; i < count; ++i) {
-          nsXULPrototypeAttribute *protoAttr = &mPrototype->mAttributes[i];
-          if (protoAttr->mName.QualifiedNameEquals(aName)) {
-              return &protoAttr->mValue;
-          }
-      }
-  }
-
-  return nsnull;
-}
-
-bool
-nsXULElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
-                      nsAString& aResult) const
-{
-    NS_ASSERTION(nsnull != aName, "must have attribute name");
-    NS_ASSERTION(aNameSpaceID != kNameSpaceID_Unknown,
-                 "must have a real namespace ID!");
-
-    const nsAttrValue* val = FindLocalOrProtoAttr(aNameSpaceID, aName);
-
-    if (!val) {
-        // Since we are returning a success code we'd better do
-        // something about the out parameters (someone may have
-        // given us a non-empty string).
-        aResult.Truncate();
-        return false;
-    }
-
-    val->ToString(aResult);
-
-    return true;
-}
-
-bool
-nsXULElement::HasAttr(PRInt32 aNameSpaceID, nsIAtom* aName) const
-{
-    NS_ASSERTION(nsnull != aName, "must have attribute name");
-    NS_ASSERTION(aNameSpaceID != kNameSpaceID_Unknown,
-                 "must have a real namespace ID!");
-
-    return mAttrsAndChildren.GetAttr(aName, aNameSpaceID) ||
-           FindPrototypeAttribute(aNameSpaceID, aName);
-}
-
-bool
-nsXULElement::AttrValueIs(PRInt32 aNameSpaceID,
-                          nsIAtom* aName,
-                          const nsAString& aValue,
-                          nsCaseTreatment aCaseSensitive) const
-{
-  NS_ASSERTION(aName, "Must have attr name");
-  NS_ASSERTION(aNameSpaceID != kNameSpaceID_Unknown, "Must have namespace");
-
-  const nsAttrValue* val = FindLocalOrProtoAttr(aNameSpaceID, aName);
-  return val && val->Equals(aValue, aCaseSensitive);
-}
-
-bool
-nsXULElement::AttrValueIs(PRInt32 aNameSpaceID,
-                          nsIAtom* aName,
-                          nsIAtom* aValue,
-                          nsCaseTreatment aCaseSensitive) const
-{
-  NS_ASSERTION(aName, "Must have attr name");
-  NS_ASSERTION(aNameSpaceID != kNameSpaceID_Unknown, "Must have namespace");
-  NS_ASSERTION(aValue, "Null value atom");
-
-  const nsAttrValue* val = FindLocalOrProtoAttr(aNameSpaceID, aName);
-  return val && val->Equals(aValue, aCaseSensitive);
-}
-
-PRInt32
-nsXULElement::FindAttrValueIn(PRInt32 aNameSpaceID,
-                              nsIAtom* aName,
-                              AttrValuesArray* aValues,
-                              nsCaseTreatment aCaseSensitive) const
-{
-  NS_ASSERTION(aName, "Must have attr name");
-  NS_ASSERTION(aNameSpaceID != kNameSpaceID_Unknown, "Must have namespace");
-  NS_ASSERTION(aValues, "Null value array");
-  
-  const nsAttrValue* val = FindLocalOrProtoAttr(aNameSpaceID, aName);
-  if (val) {
-    for (PRInt32 i = 0; aValues[i]; ++i) {
-      if (val->Equals(*aValues[i], aCaseSensitive)) {
-        return i;
-      }
-    }
-    return ATTR_VALUE_NO_MATCH;
-  }
-  return ATTR_MISSING;
-}
-
 nsresult
 nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, bool aNotify)
 {
@@ -1122,24 +981,6 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, bool aNotify)
     NS_ASSERTION(nsnull != aName, "must have attribute name");
     nsresult rv;
 
-    // Because It's Hard to maintain a magic ``unset'' value in
-    // the local attributes, we'll fault all the attributes,
-    // unhook ourselves from the prototype, and then remove the
-    // local copy of the attribute that we want to unset. In
-    // other words, we'll become ``heavyweight''.
-    //
-    // We can avoid this if the attribute isn't in the prototype,
-    // then we just need to remove it locally
-
-    nsXULPrototypeAttribute *protoattr =
-        FindPrototypeAttribute(aNameSpaceID, aName);
-    if (protoattr) {
-        // We've got an attribute on the prototype, so we need to
-        // fully fault and remove the local copy.
-        rv = MakeHeavyweight();
-        NS_ENSURE_SUCCESS(rv, rv);
-    }
-
     nsIDocument* doc = GetCurrentDoc();
     mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, aNotify);
 
@@ -1152,9 +993,6 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, bool aNotify)
 
     PRInt32 index = mAttrsAndChildren.IndexOfAttr(aName, aNameSpaceID);
     if (index < 0) {
-        NS_ASSERTION(!protoattr, "we used to have a protoattr, we should now "
-                                 "have a normal one");
-
         return NS_OK;
     }
 
@@ -1301,102 +1139,6 @@ nsXULElement::RemoveBroadcaster(const nsAString & broadcasterId)
     }
 }
 
-const nsAttrName*
-nsXULElement::GetAttrNameAt(PRUint32 aIndex) const
-{
-    PRUint32 localCount = mAttrsAndChildren.AttrCount();
-    PRUint32 protoCount = mPrototype ? mPrototype->mNumAttributes : 0;
-
-    if (localCount > protoCount) {
-        // More local than proto, put local first
-
-        // Is the index low enough to just grab a local attr?
-        if (aIndex < localCount) {
-            return mAttrsAndChildren.AttrNameAt(aIndex);
-        }
-
-        aIndex -= localCount;
-
-        // Search though prototype attributes while skipping names that exist in
-        // the local array.
-        for (PRUint32 i = 0; i < protoCount; i++) {
-            const nsAttrName* name = &mPrototype->mAttributes[i].mName;
-            if (mAttrsAndChildren.GetAttr(name->LocalName(), name->NamespaceID())) {
-                aIndex++;
-            }
-            if (i == aIndex) {
-                return name;
-            }
-        }
-    }
-    else {
-        // More proto than local, put proto first
-
-        // Is the index low enough to just grab a proto attr?
-        if (aIndex < protoCount) {
-            return &mPrototype->mAttributes[aIndex].mName;
-        }
-
-        aIndex -= protoCount;
-
-        // Search though local attributes while skipping names that exist in
-        // the prototype array.
-        for (PRUint32 i = 0; i < localCount; i++) {
-            const nsAttrName* name = mAttrsAndChildren.AttrNameAt(i);
-
-            for (PRUint32 j = 0; j < protoCount; j++) {
-                if (mPrototype->mAttributes[j].mName.Equals(*name)) {
-                    aIndex++;
-                    break;
-                }
-            }
-            if (i == aIndex) {
-                return name;
-            }
-        }
-    }
-
-    return nsnull;
-}
-
-PRUint32
-nsXULElement::GetAttrCount() const
-{
-    PRUint32 localCount = mAttrsAndChildren.AttrCount();
-    PRUint32 protoCount = mPrototype ? mPrototype->mNumAttributes : 0;
-
-    if (localCount > protoCount) {
-        // More local than proto, remove dups from proto array
-        PRUint32 count = localCount;
-
-        for (PRUint32 i = 0; i < protoCount; i++) {
-            const nsAttrName* name = &mPrototype->mAttributes[i].mName;
-            if (!mAttrsAndChildren.GetAttr(name->LocalName(), name->NamespaceID())) {
-                count++;
-            }
-        }
-
-        return count;
-    }
-
-    // More proto than local, remove dups from local array
-    PRUint32 count = protoCount;
-
-    for (PRUint32 i = 0; i < localCount; i++) {
-        const nsAttrName* name = mAttrsAndChildren.AttrNameAt(i);
-
-        count++;
-        for (PRUint32 j = 0; j < protoCount; j++) {
-            if (mPrototype->mAttributes[j].mName.Equals(*name)) {
-                count--;
-                break;
-            }
-        }
-    }
-
-    return count;
-}
-
 void
 nsXULElement::DestroyContent()
 {
@@ -1560,53 +1302,12 @@ nsXULElement::GetBuilder(nsIXULTemplateBuilder** aBuilder)
 //----------------------------------------------------------------------
 // Implementation methods
 
-// XXX DoGetID and DoGetClasses must be defined here because we have proto
-// attributes.
-nsIAtom*
-nsXULElement::DoGetID() const
-{
-    NS_ASSERTION(HasID(), "Unexpected call");
-    const nsAttrValue* attr =
-        FindLocalOrProtoAttr(kNameSpaceID_None, nsGkAtoms::id);
-
-    // We need the nullcheck here because during unlink the prototype loses
-    // all of its attributes. We might want to change that.
-    // The nullcheck would also be needed if we make UnsetAttr use
-    // nsGenericElement::UnsetAttr as that calls out to various code between
-    // removing the attribute and calling ClearHasID().
-
-    return attr ? attr->GetAtomValue() : nsnull;
-}
-
-const nsAttrValue*
-nsXULElement::DoGetClasses() const
-{
-    NS_ASSERTION(HasFlag(NODE_MAY_HAVE_CLASS), "Unexpected call");
-    return FindLocalOrProtoAttr(kNameSpaceID_None, nsGkAtoms::_class);
-}
-
 NS_IMETHODIMP
 nsXULElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
 {
     return NS_OK;
 }
 
-css::StyleRule*
-nsXULElement::GetInlineStyleRule()
-{
-    if (!MayHaveStyle()) {
-        return nsnull;
-    }
-    // Fetch the cached style rule from the attributes.
-    const nsAttrValue* attrVal = FindLocalOrProtoAttr(kNameSpaceID_None, nsGkAtoms::style);
-
-    if (attrVal && attrVal->Type() == nsAttrValue::eCSSStyleRule) {
-        return attrVal->GetCSSStyleRuleValue();
-    }
-
-    return nsnull;
-}
-
 nsChangeHint
 nsXULElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
                                      PRInt32 aModType) const
@@ -1737,35 +1438,6 @@ NS_IMPL_XUL_STRING_ATTR(Ref, ref)
 NS_IMPL_XUL_STRING_ATTR(TooltipText, tooltiptext)
 NS_IMPL_XUL_STRING_ATTR(StatusText, statustext)
 
-nsresult
-nsXULElement::EnsureLocalStyle()
-{
-    // Clone the prototype rule, if we don't have a local one.
-    if (mPrototype &&
-        !mAttrsAndChildren.GetAttr(nsGkAtoms::style, kNameSpaceID_None)) {
-
-        nsXULPrototypeAttribute *protoattr =
-                  FindPrototypeAttribute(kNameSpaceID_None, nsGkAtoms::style);
-        if (protoattr && protoattr->mValue.Type() == nsAttrValue::eCSSStyleRule) {
-            nsRefPtr<css::Rule> ruleClone =
-                protoattr->mValue.GetCSSStyleRuleValue()->Clone();
-
-            nsString stringValue;
-            protoattr->mValue.ToString(stringValue);
-
-            nsAttrValue value;
-            nsRefPtr<css::StyleRule> styleRule = do_QueryObject(ruleClone);
-            value.SetTo(styleRule, &stringValue);
-
-            nsresult rv =
-                mAttrsAndChildren.SetAndTakeAttr(nsGkAtoms::style, value);
-            NS_ENSURE_SUCCESS(rv, rv);
-        }
-    }
-
-    return NS_OK;
-}
-
 nsresult
 nsXULElement::LoadSrc()
 {
@@ -2044,76 +1716,17 @@ nsXULElement::IntrinsicState() const
 
 //----------------------------------------------------------------------
 
-nsGenericElement::nsAttrInfo
-nsXULElement::GetAttrInfo(PRInt32 aNamespaceID, nsIAtom *aName) const
+nsresult
+nsXULElement::MakeHeavyweight(nsXULPrototypeElement* aPrototype)
 {
-
-    nsAttrInfo info(nsStyledElement::GetAttrInfo(aNamespaceID, aName));
-    if (!info.mValue) {
-        nsXULPrototypeAttribute *protoattr =
-            FindPrototypeAttribute(aNamespaceID, aName);
-        if (protoattr) {
-            return nsAttrInfo(&protoattr->mName, &protoattr->mValue);
-        }
+    if (!aPrototype) {
+        return NS_OK;
     }
 
-    return info;
-}
-
-
-nsXULPrototypeAttribute *
-nsXULElement::FindPrototypeAttribute(PRInt32 aNamespaceID,
-                                     nsIAtom* aLocalName) const
-{
-    if (!mPrototype) {
-        return nsnull;
-    }
-
-    PRUint32 i, count = mPrototype->mNumAttributes;
-    if (aNamespaceID == kNameSpaceID_None) {
-        // Common case so optimize for this
-        for (i = 0; i < count; ++i) {
-            nsXULPrototypeAttribute *protoattr = &mPrototype->mAttributes[i];
-            if (protoattr->mName.Equals(aLocalName)) {
-                return protoattr;
-            }
-        }
-    }
-    else {
-        for (i = 0; i < count; ++i) {
-            nsXULPrototypeAttribute *protoattr = &mPrototype->mAttributes[i];
-            if (protoattr->mName.Equals(aLocalName, aNamespaceID)) {
-                return protoattr;
-            }
-        }
-    }
-
-    return nsnull;
-}
-
-nsresult nsXULElement::MakeHeavyweight()
-{
-    if (!mPrototype)
-        return NS_OK;           // already heavyweight
-
-    nsRefPtr<nsXULPrototypeElement> proto;
-    proto.swap(mPrototype);
-
-    bool hadAttributes = mAttrsAndChildren.AttrCount() > 0;
-
     PRUint32 i;
     nsresult rv;
-    for (i = 0; i < proto->mNumAttributes; ++i) {
-        nsXULPrototypeAttribute* protoattr = &proto->mAttributes[i];
-
-        // We might have a local value for this attribute, in which case
-        // we don't want to copy the prototype's value.
-        if (hadAttributes &&
-            mAttrsAndChildren.GetAttr(protoattr->mName.LocalName(),
-                                      protoattr->mName.NamespaceID())) {
-            continue;
-        }
-
+    for (i = 0; i < aPrototype->mNumAttributes; ++i) {
+        nsXULPrototypeAttribute* protoattr = &aPrototype->mAttributes[i];
         nsAttrValue attrValue;
         
         // Style rules need to be cloned.
@@ -2295,7 +1908,7 @@ bool
 nsXULElement::BoolAttrIsTrue(nsIAtom* aName)
 {
     const nsAttrValue* attr =
-        FindLocalOrProtoAttr(kNameSpaceID_None, aName);
+        GetAttrInfo(kNameSpaceID_None, aName).mValue;
 
     return attr && attr->Type() == nsAttrValue::eAtom &&
            attr->GetAtomValue() == nsGkAtoms::_true;
@@ -2305,7 +1918,6 @@ void
 nsXULElement::RecompileScriptEventListeners()
 {
     PRInt32 i, count = mAttrsAndChildren.AttrCount();
-    bool haveLocalAttributes = (count > 0);
     for (i = 0; i < count; ++i) {
         const nsAttrName *name = mAttrsAndChildren.AttrNameAt(i);
 
@@ -2323,34 +1935,6 @@ nsXULElement::RecompileScriptEventListeners()
         GetAttr(kNameSpaceID_None, attr, value);
         AddScriptEventListener(attr, value, true);
     }
-
-    if (mPrototype) {
-
-        count = mPrototype->mNumAttributes;
-        for (i = 0; i < count; ++i) {
-            const nsAttrName &name = mPrototype->mAttributes[i].mName;
-
-            // Eventlistenener-attributes are always in the null namespace
-            if (!name.IsAtom()) {
-                continue;
-            }
-
-            nsIAtom *attr = name.Atom();
-
-            // Don't clobber a locally modified attribute.
-            if (haveLocalAttributes && mAttrsAndChildren.GetAttr(attr)) {
-                continue;
-            }
-
-            if (!nsContentUtils::IsEventAttributeName(attr, EventNameType_XUL)) {
-                continue;
-            }
-
-            nsAutoString value;
-            GetAttr(kNameSpaceID_None, attr, value);
-            AddScriptEventListener(attr, value, true);
-        }
-    }
 }
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULPrototypeNode)
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index 9d8fb580ff7..d0ff262b08c 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -408,23 +408,8 @@ public:
                                 bool aCompileEventHandlers);
     virtual void UnbindFromTree(bool aDeep, bool aNullParent);
     virtual void RemoveChildAt(PRUint32 aIndex, bool aNotify);
-    virtual bool GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
-                           nsAString& aResult) const;
-    virtual bool HasAttr(PRInt32 aNameSpaceID, nsIAtom* aName) const;
-    virtual bool AttrValueIs(PRInt32 aNameSpaceID, nsIAtom* aName,
-                               const nsAString& aValue,
-                               nsCaseTreatment aCaseSensitive) const;
-    virtual bool AttrValueIs(PRInt32 aNameSpaceID, nsIAtom* aName,
-                               nsIAtom* aValue,
-                               nsCaseTreatment aCaseSensitive) const;
-    virtual PRInt32 FindAttrValueIn(PRInt32 aNameSpaceID,
-                                    nsIAtom* aName,
-                                    AttrValuesArray* aValues,
-                                    nsCaseTreatment aCaseSensitive) const;
     virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                                bool aNotify);
-    virtual const nsAttrName* GetAttrNameAt(PRUint32 aIndex) const;
-    virtual PRUint32 GetAttrCount() const;
     virtual void DestroyContent();
 
 #ifdef DEBUG
@@ -441,11 +426,8 @@ public:
     virtual nsIContent *GetBindingParent() const;
     virtual bool IsNodeOfType(PRUint32 aFlags) const;
     virtual bool IsFocusable(PRInt32 *aTabIndex = nsnull, bool aWithMouse = false);
-    virtual nsIAtom* DoGetID() const;
-    virtual const nsAttrValue* DoGetClasses() const;
 
     NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
-    virtual mozilla::css::StyleRule* GetInlineStyleRule();
     virtual nsChangeHint GetAttributeChangeHint(const nsIAtom* aAttribute,
                                                 PRInt32 aModType) const;
     NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
@@ -471,8 +453,6 @@ public:
     virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
     virtual nsEventStates IntrinsicState() const;
 
-    nsresult EnsureLocalStyle();
-
     nsresult GetFrameLoader(nsIFrameLoader** aFrameLoader);
     already_AddRefed<nsFrameLoader> GetFrameLoader();
     nsresult SwapFrameLoaders(nsIFrameLoaderOwner* aOtherOwner);
@@ -487,15 +467,6 @@ public:
       mBindingParent = aBindingParent;
     }
 
-    const nsAttrValue* GetAttrValue(const nsAString& aName);
-
-    /**
-     * Get the attr info for the given namespace ID and attribute name.
-     * The namespace ID must not be kNameSpaceID_Unknown and the name
-     * must not be null.
-     */
-    virtual nsAttrInfo GetAttrInfo(PRInt32 aNamespaceID, nsIAtom* aName) const;
-
     virtual nsXPCClassInfo* GetClassInfo();
 
     virtual nsIDOMNode* AsDOMNode() { return this; }
@@ -532,9 +503,6 @@ protected:
 
     nsresult LoadSrc();
 
-    // Required fields
-    nsRefPtr<nsXULPrototypeElement>     mPrototype;
-
     /**
      * The nearest enclosing content node with a binding
      * that created us. [Weak]
@@ -544,12 +512,7 @@ protected:
     /**
      * Abandon our prototype linkage, and copy all attributes locally
      */
-    nsresult MakeHeavyweight();
-
-    const nsAttrValue* FindLocalOrProtoAttr(PRInt32 aNameSpaceID,
-                                            nsIAtom *aName) const {
-        return nsXULElement::GetAttrInfo(aNameSpaceID, aName).mValue;
-    }
+    nsresult MakeHeavyweight(nsXULPrototypeElement* aPrototype);
 
     virtual nsresult BeforeSetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
                                    const nsAttrValueOrString* aValue,
@@ -567,11 +530,6 @@ protected:
     virtual nsEventListenerManager*
       GetEventListenerManagerForAttr(nsIAtom* aAttrName, bool* aDefer);
   
-    /**
-     * Return our prototype's attribute, if one exists.
-     */
-    nsXULPrototypeAttribute *FindPrototypeAttribute(PRInt32 aNameSpaceID,
-                                                    nsIAtom *aName) const;
     /**
      * Add a listener for the specified attribute, if appropriate.
      */
@@ -589,8 +547,6 @@ protected:
 
     void SetDrawsInTitlebar(bool aState);
 
-    const nsAttrName* InternalGetExistingAttrNameFromQName(const nsAString& aStr) const;
-
     void RemoveBroadcaster(const nsAString & broadcasterId);
 
 protected:

From 7f0f075928399be0aa99066a4ae17eb4e032c042 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Wed, 18 Jul 2012 12:31:40 -0400
Subject: [PATCH 067/118] [Bug 774505] Don't include Layers.h everywhere
 r=cjones

---
 content/base/src/nsFrameLoader.h              |  2 +-
 content/canvas/src/WebGLContext.h             |  1 -
 content/media/nsBuiltinDecoder.h              |  5 +-
 content/media/nsBuiltinDecoderReader.h        |  1 -
 .../media/nsBuiltinDecoderStateMachine.cpp    |  4 +-
 content/media/nsMediaDecoder.h                |  5 +-
 dom/bluetooth/BluetoothManager.h              |  1 +
 dom/file/FileHelper.h                         |  1 +
 dom/ipc/PBrowser.ipdl                         |  2 +-
 dom/ipc/TabChild.cpp                          |  2 +-
 gfx/layers/ImageLayers.h                      |  7 +--
 gfx/layers/LayerSorter.cpp                    |  1 +
 gfx/layers/LayerSorter.h                      |  4 +-
 gfx/layers/Layers.h                           | 13 +----
 gfx/layers/LayersBackend.h                    | 22 +++++++++
 gfx/layers/Makefile.in                        |  1 +
 gfx/layers/basic/BasicCanvasLayer.cpp         |  3 +-
 gfx/layers/basic/BasicLayerManager.cpp        |  2 +-
 gfx/layers/d3d10/ImageLayerD3D10.cpp          | 32 ++++++-------
 gfx/layers/d3d10/LayerManagerD3D10.h          |  2 -
 gfx/layers/d3d9/ImageLayerD3D9.cpp            | 22 ++++-----
 gfx/layers/ipc/CompositorParent.cpp           |  4 +-
 gfx/layers/ipc/PCompositor.ipdl               |  2 +-
 gfx/layers/ipc/ShadowLayers.cpp               |  3 +-
 gfx/layers/ipc/ShadowLayers.h                 |  3 +-
 gfx/layers/opengl/ImageLayerOGL.cpp           | 47 ++++++++++---------
 gfx/layers/opengl/LayerManagerOGLProgram.h    |  5 +-
 ipc/glue/IPCMessageUtils.h                    | 14 +++---
 layout/base/FrameLayerBuilder.h               |  4 ++
 layout/base/nsDisplayList.h                   |  1 -
 layout/ipc/PRenderFrame.ipdl                  |  2 +-
 layout/ipc/RenderFrameChild.cpp               |  1 +
 layout/ipc/RenderFrameParent.cpp              |  9 ++--
 layout/ipc/RenderFrameParent.h                |  4 +-
 widget/android/nsWindow.cpp                   |  6 +--
 widget/android/nsWindow.h                     |  6 +--
 widget/cocoa/nsChildView.mm                   |  2 +-
 widget/cocoa/nsCocoaWindow.h                  |  2 +-
 widget/gonk/nsWindow.cpp                      |  6 +--
 widget/gonk/nsWindow.h                        |  2 +-
 widget/gtk2/nsWindow.cpp                      |  6 +--
 widget/nsIWidget.h                            |  9 ++--
 widget/qt/nsWindow.cpp                        |  4 +-
 widget/windows/nsWindow.cpp                   | 28 +++++------
 widget/windows/nsWindow.h                     |  2 +-
 widget/windows/nsWindowGfx.cpp                | 10 ++--
 widget/xpwidgets/PuppetWidget.cpp             |  4 +-
 widget/xpwidgets/PuppetWidget.h               |  3 +-
 widget/xpwidgets/nsBaseWidget.cpp             | 14 +++---
 widget/xpwidgets/nsBaseWidget.h               |  3 +-
 50 files changed, 181 insertions(+), 158 deletions(-)
 create mode 100644 gfx/layers/LayersBackend.h

diff --git a/content/base/src/nsFrameLoader.h b/content/base/src/nsFrameLoader.h
index 86677a2eff9..4d1650f9e6b 100644
--- a/content/base/src/nsFrameLoader.h
+++ b/content/base/src/nsFrameLoader.h
@@ -19,9 +19,9 @@
 #include "nsIURI.h"
 #include "nsAutoPtr.h"
 #include "nsFrameMessageManager.h"
-#include "Layers.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/Attributes.h"
+#include "Layers.h"
 
 class nsIURI;
 class nsSubDocumentFrame;
diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h
index fdc4bafcb80..f43d3c971a2 100644
--- a/content/canvas/src/WebGLContext.h
+++ b/content/canvas/src/WebGLContext.h
@@ -25,7 +25,6 @@
 #include "nsIObserver.h"
 
 #include "GLContextProvider.h"
-#include "Layers.h"
 
 #include "mozilla/LinkedList.h"
 #include "mozilla/CheckedInt.h"
diff --git a/content/media/nsBuiltinDecoder.h b/content/media/nsBuiltinDecoder.h
index d1e7fe6db70..3834f4e8dbc 100644
--- a/content/media/nsBuiltinDecoder.h
+++ b/content/media/nsBuiltinDecoder.h
@@ -196,9 +196,12 @@ destroying the nsBuiltinDecoder object.
 #include "nsMediaDecoder.h"
 #include "nsHTMLMediaElement.h"
 #include "mozilla/ReentrantMonitor.h"
-
+#include "ImageLayers.h"
 class nsAudioStream;
 
+typedef mozilla::layers::Image Image;
+typedef mozilla::layers::ImageContainer ImageContainer;
+
 static inline bool IsCurrentThread(nsIThread* aThread) {
   return NS_GetCurrentThread() == aThread;
 }
diff --git a/content/media/nsBuiltinDecoderReader.h b/content/media/nsBuiltinDecoderReader.h
index efaca600f64..31bf9ab6ead 100644
--- a/content/media/nsBuiltinDecoderReader.h
+++ b/content/media/nsBuiltinDecoderReader.h
@@ -7,7 +7,6 @@
 #define nsBuiltinDecoderReader_h_
 
 #include <nsDeque.h>
-#include "ImageLayers.h"
 #include "nsSize.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "MediaStreamGraph.h"
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index 8047109d989..ac16c71aa43 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -550,11 +550,11 @@ void nsBuiltinDecoderStateMachine::SendOutputStreamAudio(AudioData* aAudio,
   aStream->mAudioFramesWritten += aAudio->mFrames - PRInt32(offset);
 }
 
-static void WriteVideoToMediaStream(Image* aImage,
+static void WriteVideoToMediaStream(mozilla::layers::Image* aImage,
                                     PRInt64 aDuration, const gfxIntSize& aIntrinsicSize,
                                     VideoSegment* aOutput)
 {
-  nsRefPtr<Image> image = aImage;
+  nsRefPtr<mozilla::layers::Image> image = aImage;
   aOutput->AppendFrame(image.forget(), aDuration, aIntrinsicSize);
 }
 
diff --git a/content/media/nsMediaDecoder.h b/content/media/nsMediaDecoder.h
index 2c747fc8d97..012c34fdf0f 100644
--- a/content/media/nsMediaDecoder.h
+++ b/content/media/nsMediaDecoder.h
@@ -6,7 +6,6 @@
 #if !defined(nsMediaDecoder_h_)
 #define nsMediaDecoder_h_
 
-#include "ImageLayers.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "VideoFrameContainer.h"
 #include "MediaStreamGraph.h"
@@ -38,8 +37,6 @@ static const PRUint32 FRAMEBUFFER_LENGTH_MAX = 16384;
 class nsMediaDecoder : public nsIObserver
 {
 public:
-  typedef mozilla::layers::Image Image;
-  typedef mozilla::layers::ImageContainer ImageContainer;
   typedef mozilla::MediaResource MediaResource;
   typedef mozilla::ReentrantMonitor ReentrantMonitor;
   typedef mozilla::SourceMediaStream SourceMediaStream;
@@ -368,7 +365,7 @@ public:
   virtual PRInt64 AudioQueueMemoryInUse() = 0;
 
   VideoFrameContainer* GetVideoFrameContainer() { return mVideoFrameContainer; }
-  ImageContainer* GetImageContainer()
+  mozilla::layers::ImageContainer* GetImageContainer()
   {
     return mVideoFrameContainer ? mVideoFrameContainer->GetImageContainer() : nsnull;
   }
diff --git a/dom/bluetooth/BluetoothManager.h b/dom/bluetooth/BluetoothManager.h
index 9ca5f1ca004..fea0f14fc7e 100644
--- a/dom/bluetooth/BluetoothManager.h
+++ b/dom/bluetooth/BluetoothManager.h
@@ -11,6 +11,7 @@
 #include "nsDOMEventTargetHelper.h"
 #include "nsIDOMBluetoothManager.h"
 #include "mozilla/Observer.h"
+#include "nsIEventTarget.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
diff --git a/dom/file/FileHelper.h b/dom/file/FileHelper.h
index 8e1a2f31e2a..13f99f16b9d 100644
--- a/dom/file/FileHelper.h
+++ b/dom/file/FileHelper.h
@@ -10,6 +10,7 @@
 #include "FileCommon.h"
 
 #include "nsIRequestObserver.h"
+#include "nsThreadUtils.h"
 
 class nsIFileStorage;
 
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 7890d6ec02d..8d8eb862d0a 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -20,7 +20,7 @@ include "IPC/nsGUIEventIPC.h";
 
 using IPC::URI;
 using gfxMatrix;
-using mozilla::LayersBackend;
+using mozilla::layers::LayersBackend;
 using mozilla::WindowsHandle;
 using nscolor;
 using nsCompositionEvent;
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 40711451df6..3a86fd3914f 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -1030,7 +1030,7 @@ TabChild::InitWidget(const nsIntSize& size)
         nsnull                  // nsDeviceContext
         );
 
-    LayerManager::LayersBackend be;
+    LayersBackend be;
     uint64_t id;
     int32_t maxTextureSize;
     RenderFrameChild* remoteFrame =
diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h
index 63005c83ac7..a519ab5857e 100644
--- a/gfx/layers/ImageLayers.h
+++ b/gfx/layers/ImageLayers.h
@@ -16,6 +16,7 @@
 #include "mozilla/mozalloc.h"
 #include "mozilla/Mutex.h"
 #include "gfxPlatform.h"
+#include "LayersBackend.h"
 
 #ifdef XP_MACOSX
 #include "nsIOSurface.h"
@@ -133,9 +134,9 @@ public:
   virtual already_AddRefed<gfxASurface> GetAsSurface() = 0;
   virtual gfxIntSize GetSize() = 0;
 
-  ImageBackendData* GetBackendData(LayerManager::LayersBackend aBackend)
+  ImageBackendData* GetBackendData(LayersBackend aBackend)
   { return mBackendData[aBackend]; }
-  void SetBackendData(LayerManager::LayersBackend aBackend, ImageBackendData* aData)
+  void SetBackendData(LayersBackend aBackend, ImageBackendData* aData)
   { mBackendData[aBackend] = aData; }
 
 protected:
@@ -144,7 +145,7 @@ protected:
     mFormat(aFormat)
   {}
 
-  nsAutoPtr<ImageBackendData> mBackendData[LayerManager::LAYERS_LAST];
+  nsAutoPtr<ImageBackendData> mBackendData[mozilla::layers::LAYERS_LAST];
 
   void* mImplData;
   Format mFormat;
diff --git a/gfx/layers/LayerSorter.cpp b/gfx/layers/LayerSorter.cpp
index a1be7758d8b..106b27c8291 100644
--- a/gfx/layers/LayerSorter.cpp
+++ b/gfx/layers/LayerSorter.cpp
@@ -7,6 +7,7 @@
 #include "DirectedGraph.h"
 #include "limits.h"
 #include "gfxLineSegment.h"
+#include "Layers.h"
 
 namespace mozilla {
 namespace layers {
diff --git a/gfx/layers/LayerSorter.h b/gfx/layers/LayerSorter.h
index 1ceccfd9d37..2f0ff5f5d95 100644
--- a/gfx/layers/LayerSorter.h
+++ b/gfx/layers/LayerSorter.h
@@ -6,11 +6,13 @@
 #ifndef GFX_LAYERSORTER_H
 #define GFX_LAYERSORTER_H
 
-#include "Layers.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace layers {
 
+class Layer;
+
 void SortLayersBy3DZOrder(nsTArray<Layer*>& aLayers);
 
 }
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 571936633d1..e27623b6cde 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -18,7 +18,7 @@
 #include "gfxPattern.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
-
+#include "LayersBackend.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/TimeStamp.h"
 
@@ -200,15 +200,6 @@ class THEBES_API LayerManager {
   NS_INLINE_DECL_REFCOUNTING(LayerManager)
 
 public:
-  enum LayersBackend {
-    LAYERS_NONE = 0,
-    LAYERS_BASIC,
-    LAYERS_OPENGL,
-    LAYERS_D3D9,
-    LAYERS_D3D10,
-    LAYERS_LAST
-  };
-
   LayerManager() : mDestroyed(false), mSnapEffectiveTransforms(true), mId(0)
   {
     InitLog();
@@ -508,7 +499,7 @@ public:
   static bool IsLogEnabled();
   static PRLogModuleInfo* GetLog() { return sLog; }
 
-  bool IsCompositingCheap(LayerManager::LayersBackend aBackend)
+  bool IsCompositingCheap(LayersBackend aBackend)
   { return LAYERS_BASIC != aBackend; }
 
   virtual bool IsCompositingCheap() { return true; }
diff --git a/gfx/layers/LayersBackend.h b/gfx/layers/LayersBackend.h
new file mode 100644
index 00000000000..b882b12de4e
--- /dev/null
+++ b/gfx/layers/LayersBackend.h
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GFX_LAYERSBACKEND_H
+#define GFX_LAYERSBACKEND_H
+
+namespace mozilla {
+namespace layers {
+enum LayersBackend {
+  LAYERS_NONE = 0,
+  LAYERS_BASIC,
+  LAYERS_OPENGL,
+  LAYERS_D3D9,
+  LAYERS_D3D10,
+  LAYERS_LAST
+};
+}
+}
+
+#endif /* GFX_LAYERSBACKEND_H */
diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
index 6636d2d9ab9..e633332cdd5 100644
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -33,6 +33,7 @@ EXPORTS = \
         BasicImplData.h \
         ImageLayers.h \
         Layers.h \
+        LayersBackend.h \
         LayerManagerOGLShaders.h \
         LayerManagerOGL.h \
         LayerManagerOGLProgram.h \
diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index cd4af184717..663a0287274 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -10,6 +10,7 @@
 
 #include "BasicLayersImpl.h"
 #include "nsXULAppAPI.h"
+#include "LayersBackend.h"
 
 using namespace mozilla::gfx;
 
@@ -374,7 +375,7 @@ BasicShadowableCanvasLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
   }
 
   if (mGLContext &&
-      BasicManager()->GetParentBackendType() == LayerManager::LAYERS_OPENGL) {
+      BasicManager()->GetParentBackendType() == mozilla::layers::LAYERS_OPENGL) {
     TextureImage::TextureShareType flags;
     // if process type is default, then it is single-process (non-e10s)
     if (XRE_GetProcessType() == GeckoProcessType_Default)
diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp
index 54ced4ca105..476ff654bb3 100644
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -1133,7 +1133,7 @@ BasicShadowLayerManager::CreateThebesLayer()
 {
   NS_ASSERTION(InConstruction(), "Only allowed in construction phase");
 #ifdef FORCE_BASICTILEDTHEBESLAYER
-  if (HasShadowManager() && GetParentBackendType() == LayerManager::LAYERS_OPENGL) {
+  if (HasShadowManager() && GetParentBackendType() == LAYERS_OPENGL) {
     // BasicTiledThebesLayer doesn't support main
     // thread compositing so only return this layer
     // type if we have a shadow manager.
diff --git a/gfx/layers/d3d10/ImageLayerD3D10.cpp b/gfx/layers/d3d10/ImageLayerD3D10.cpp
index 34de24fb8fe..30a3838b93a 100644
--- a/gfx/layers/d3d10/ImageLayerD3D10.cpp
+++ b/gfx/layers/d3d10/ImageLayerD3D10.cpp
@@ -14,7 +14,7 @@
 
 namespace mozilla {
 namespace layers {
-  
+
 static already_AddRefed<ID3D10Texture2D>
 DataToTexture(ID3D10Device *aDevice,
               unsigned char *data,
@@ -22,13 +22,13 @@ DataToTexture(ID3D10Device *aDevice,
               const gfxIntSize &aSize)
 {
   D3D10_SUBRESOURCE_DATA srdata;
-  
+
   CD3D10_TEXTURE2D_DESC desc(DXGI_FORMAT_B8G8R8A8_UNORM,
                              aSize.width,
                              aSize.height,
                              1, 1);
   desc.Usage = D3D10_USAGE_IMMUTABLE;
-  
+
   srdata.pSysMem = data;
   srdata.SysMemPitch = stride;
 
@@ -99,14 +99,14 @@ ImageLayerD3D10::GetImageSRView(Image* aImage, bool& aHasAlpha, IDXGIKeyedMutex
   if (aImage->GetFormat() == Image::REMOTE_IMAGE_BITMAP) {
     RemoteBitmapImage *remoteImage =
       static_cast<RemoteBitmapImage*>(aImage);
-      
-    if (!aImage->GetBackendData(LayerManager::LAYERS_D3D10)) {
+
+    if (!aImage->GetBackendData(mozilla::layers::LAYERS_D3D10)) {
       nsAutoPtr<TextureD3D10BackendData> dat(new TextureD3D10BackendData());
       dat->mTexture = DataToTexture(device(), remoteImage->mData, remoteImage->mStride, remoteImage->mSize);
 
       if (dat->mTexture) {
         device()->CreateShaderResourceView(dat->mTexture, NULL, getter_AddRefs(dat->mSRView));
-        aImage->SetBackendData(LayerManager::LAYERS_D3D10, dat.forget());
+        aImage->SetBackendData(mozilla::layers::LAYERS_D3D10, dat.forget());
       }
     }
 
@@ -126,13 +126,13 @@ ImageLayerD3D10::GetImageSRView(Image* aImage, bool& aHasAlpha, IDXGIKeyedMutex
       return nsnull;
     }
 
-    if (!aImage->GetBackendData(LayerManager::LAYERS_D3D10)) {
+    if (!aImage->GetBackendData(mozilla::layers::LAYERS_D3D10)) {
       nsAutoPtr<TextureD3D10BackendData> dat(new TextureD3D10BackendData());
       dat->mTexture = SurfaceToTexture(device(), cairoImage->mSurface, cairoImage->mSize);
 
       if (dat->mTexture) {
         device()->CreateShaderResourceView(dat->mTexture, NULL, getter_AddRefs(dat->mSRView));
-        aImage->SetBackendData(LayerManager::LAYERS_D3D10, dat.forget());
+        aImage->SetBackendData(mozilla::layers::LAYERS_D3D10, dat.forget());
       }
     }
 
@@ -143,7 +143,7 @@ ImageLayerD3D10::GetImageSRView(Image* aImage, bool& aHasAlpha, IDXGIKeyedMutex
   }
 
   TextureD3D10BackendData *data =
-    static_cast<TextureD3D10BackendData*>(aImage->GetBackendData(LayerManager::LAYERS_D3D10));
+    static_cast<TextureD3D10BackendData*>(aImage->GetBackendData(mozilla::layers::LAYERS_D3D10));
 
   if (!data) {
     return nsnull;
@@ -201,7 +201,7 @@ ImageLayerD3D10::RenderLayer()
     if (!srView) {
       return;
     }
-    
+
     PRUint8 shaderFlags = SHADER_PREMUL;
     shaderFlags |= LoadMaskTexture();
     shaderFlags |= hasAlpha
@@ -228,12 +228,12 @@ ImageLayerD3D10::RenderLayer()
       return;
     }
 
-    if (!yuvImage->GetBackendData(LayerManager::LAYERS_D3D10)) {
+    if (!yuvImage->GetBackendData(mozilla::layers::LAYERS_D3D10)) {
       AllocateTexturesYCbCr(yuvImage);
     }
 
     PlanarYCbCrD3D10BackendData *data =
-      static_cast<PlanarYCbCrD3D10BackendData*>(yuvImage->GetBackendData(LayerManager::LAYERS_D3D10));
+      static_cast<PlanarYCbCrD3D10BackendData*>(yuvImage->GetBackendData(mozilla::layers::LAYERS_D3D10));
 
     if (!data) {
       return;
@@ -367,7 +367,7 @@ void ImageLayerD3D10::AllocateTexturesYCbCr(PlanarYCbCrImage *aImage)
   device()->CreateShaderResourceView(backendData->mCbTexture, NULL, getter_AddRefs(backendData->mCbView));
   device()->CreateShaderResourceView(backendData->mCrTexture, NULL, getter_AddRefs(backendData->mCrView));
 
-  aImage->SetBackendData(LayerManager::LAYERS_D3D10, backendData.forget());
+  aImage->SetBackendData(mozilla::layers::LAYERS_D3D10, backendData.forget());
 }
 
 already_AddRefed<ID3D10ShaderResourceView>
@@ -469,9 +469,9 @@ RemoteDXGITextureImage::GetAsSurface()
 TextureD3D10BackendData*
 RemoteDXGITextureImage::GetD3D10TextureBackendData(ID3D10Device *aDevice)
 {
-  if (GetBackendData(LayerManager::LAYERS_D3D10)) {
+  if (GetBackendData(mozilla::layers::LAYERS_D3D10)) {
     TextureD3D10BackendData *data =
-      static_cast<TextureD3D10BackendData*>(GetBackendData(LayerManager::LAYERS_D3D10));
+      static_cast<TextureD3D10BackendData*>(GetBackendData(mozilla::layers::LAYERS_D3D10));
     
     nsRefPtr<ID3D10Device> device;
     data->mTexture->GetDevice(getter_AddRefs(device));
@@ -494,7 +494,7 @@ RemoteDXGITextureImage::GetD3D10TextureBackendData(ID3D10Device *aDevice)
 
   aDevice->CreateShaderResourceView(texture, NULL, getter_AddRefs(data->mSRView));
 
-  SetBackendData(LayerManager::LAYERS_D3D10, data);
+  SetBackendData(mozilla::layers::LAYERS_D3D10, data);
 
   return data.forget();
 }
diff --git a/gfx/layers/d3d10/LayerManagerD3D10.h b/gfx/layers/d3d10/LayerManagerD3D10.h
index ce28e496c6e..83a09f88691 100644
--- a/gfx/layers/d3d10/LayerManagerD3D10.h
+++ b/gfx/layers/d3d10/LayerManagerD3D10.h
@@ -55,8 +55,6 @@ extern cairo_user_data_key_t gKeyD3D10Texture;
 class THEBES_API LayerManagerD3D10 : public ShadowLayerManager,
                                      public ShadowLayerForwarder {
 public:
-  typedef LayerManager::LayersBackend LayersBackend;
-
   LayerManagerD3D10(nsIWidget *aWidget);
   virtual ~LayerManagerD3D10();
 
diff --git a/gfx/layers/d3d9/ImageLayerD3D9.cpp b/gfx/layers/d3d9/ImageLayerD3D9.cpp
index c33721bc3a5..ac0747e34a4 100644
--- a/gfx/layers/d3d9/ImageLayerD3D9.cpp
+++ b/gfx/layers/d3d9/ImageLayerD3D9.cpp
@@ -279,7 +279,7 @@ static void AllocateTexturesYCbCr(PlanarYCbCrImage *aImage,
     backendData->mCrTexture->UnlockRect(0);
   }
 
-  aImage->SetBackendData(LayerManager::LAYERS_D3D9, backendData.forget());
+  aImage->SetBackendData(mozilla::layers::LAYERS_D3D9, backendData.forget());
 }
 
 Layer*
@@ -304,11 +304,11 @@ ImageLayerD3D9::GetTexture(Image *aImage, bool& aHasAlpha)
     RemoteBitmapImage *remoteImage =
       static_cast<RemoteBitmapImage*>(aImage);
       
-    if (!aImage->GetBackendData(LayerManager::LAYERS_D3D9)) {
+    if (!aImage->GetBackendData(mozilla::layers::LAYERS_D3D9)) {
       nsAutoPtr<TextureD3D9BackendData> dat(new TextureD3D9BackendData());
       dat->mTexture = DataToTexture(device(), remoteImage->mData, remoteImage->mStride, remoteImage->mSize, D3DFMT_A8R8G8B8);
       if (dat->mTexture) {
-        aImage->SetBackendData(LayerManager::LAYERS_D3D9, dat.forget());
+        aImage->SetBackendData(mozilla::layers::LAYERS_D3D9, dat.forget());
       }
     }
 
@@ -321,11 +321,11 @@ ImageLayerD3D9::GetTexture(Image *aImage, bool& aHasAlpha)
       return nsnull;
     }
 
-    if (!aImage->GetBackendData(LayerManager::LAYERS_D3D9)) {
+    if (!aImage->GetBackendData(mozilla::layers::LAYERS_D3D9)) {
       nsAutoPtr<TextureD3D9BackendData> dat(new TextureD3D9BackendData());
       dat->mTexture = SurfaceToTexture(device(), cairoImage->mSurface, cairoImage->mSize);
       if (dat->mTexture) {
-        aImage->SetBackendData(LayerManager::LAYERS_D3D9, dat.forget());
+        aImage->SetBackendData(mozilla::layers::LAYERS_D3D9, dat.forget());
       }
     }
 
@@ -336,7 +336,7 @@ ImageLayerD3D9::GetTexture(Image *aImage, bool& aHasAlpha)
   }
 
   TextureD3D9BackendData *data =
-    static_cast<TextureD3D9BackendData*>(aImage->GetBackendData(LayerManager::LAYERS_D3D9));
+    static_cast<TextureD3D9BackendData*>(aImage->GetBackendData(mozilla::layers::LAYERS_D3D9));
 
   if (!data) {
     return nsnull;
@@ -416,12 +416,12 @@ ImageLayerD3D9::RenderLayer()
       return;
     }
 
-    if (!yuvImage->GetBackendData(LayerManager::LAYERS_D3D9)) {
+    if (!yuvImage->GetBackendData(mozilla::layers::LAYERS_D3D9)) {
       AllocateTexturesYCbCr(yuvImage, device(), mD3DManager);
     }
 
     PlanarYCbCrD3D9BackendData *data =
-      static_cast<PlanarYCbCrD3D9BackendData*>(yuvImage->GetBackendData(LayerManager::LAYERS_D3D9));
+      static_cast<PlanarYCbCrD3D9BackendData*>(yuvImage->GetBackendData(mozilla::layers::LAYERS_D3D9));
 
     if (!data) {
       return;
@@ -616,12 +616,12 @@ ShadowImageLayerD3D9::RenderLayer()
       return;
     }
 
-    if (!mYCbCrImage->GetBackendData(LayerManager::LAYERS_D3D9)) {
+    if (!mYCbCrImage->GetBackendData(mozilla::layers::LAYERS_D3D9)) {
       AllocateTexturesYCbCr(mYCbCrImage, device(), mD3DManager);
     }
 
     PlanarYCbCrD3D9BackendData *data =
-      static_cast<PlanarYCbCrD3D9BackendData*>(mYCbCrImage->GetBackendData(LayerManager::LAYERS_D3D9));
+      static_cast<PlanarYCbCrD3D9BackendData*>(mYCbCrImage->GetBackendData(mozilla::layers::LAYERS_D3D9));
 
     if (!data) {
       return;
@@ -630,7 +630,7 @@ ShadowImageLayerD3D9::RenderLayer()
     if (!mYCbCrImage->mBufferSize) {
       return;
     }
-    
+
     SetShaderTransformAndOpacity();
 
     device()->SetVertexShaderConstantF(CBvLayerQuad,
diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
index 3474fef569e..92bbd0bb36b 100644
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -640,7 +640,7 @@ CompositorParent::AllocPLayers(const LayersBackend& aBackendHint,
 
   *aBackend = aBackendHint;
 
-  if (aBackendHint == LayerManager::LAYERS_OPENGL) {
+  if (aBackendHint == mozilla::layers::LAYERS_OPENGL) {
     nsRefPtr<LayerManagerOGL> layerManager;
     layerManager =
       new LayerManagerOGL(mWidget, mEGLSurfaceSize.width, mEGLSurfaceSize.height, mRenderToEGLSurface);
@@ -662,7 +662,7 @@ CompositorParent::AllocPLayers(const LayersBackend& aBackendHint,
     }
     *aMaxTextureSize = layerManager->GetMaxTextureSize();
     return new ShadowLayersParent(slm, this, 0);
-  } else if (aBackendHint == LayerManager::LAYERS_BASIC) {
+  } else if (aBackendHint == mozilla::layers::LAYERS_BASIC) {
     nsRefPtr<LayerManager> layerManager = new BasicShadowLayerManager(mWidget);
     mWidget = NULL;
     mLayerManager = layerManager;
diff --git a/gfx/layers/ipc/PCompositor.ipdl b/gfx/layers/ipc/PCompositor.ipdl
index 70d9dcffa66..793e03a9520 100644
--- a/gfx/layers/ipc/PCompositor.ipdl
+++ b/gfx/layers/ipc/PCompositor.ipdl
@@ -7,7 +7,7 @@
 
 include protocol PLayers;
 
-using mozilla::LayersBackend;
+using mozilla::layers::LayersBackend;
 using mozilla::null_t;
 
 namespace mozilla {
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index 2f254f17cc9..84ab57cf53d 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -22,6 +22,7 @@
 #include "RenderTrace.h"
 #include "sampler.h"
 #include "nsXULAppAPI.h"
+#include "LayersBackend.h"
 
 using namespace mozilla::ipc;
 
@@ -109,7 +110,7 @@ struct AutoTxnEnd {
 ShadowLayerForwarder::ShadowLayerForwarder()
  : mShadowManager(NULL)
  , mMaxTextureSize(0)
- , mParentBackend(LayerManager::LAYERS_NONE)
+ , mParentBackend(mozilla::layers::LAYERS_NONE)
  , mIsFirstPaint(false)
 {
   mTxn = new Transaction();
diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
index 77aefb8728c..56cfd9ac6e6 100644
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -11,7 +11,7 @@
 #include "gfxASurface.h"
 
 #include "ImageLayers.h"
-#include "Layers.h"
+#include "LayersBackend.h"
 #include "mozilla/ipc/SharedMemory.h"
 
 class gfxSharedImageSurface;
@@ -101,7 +101,6 @@ class ShadowLayerForwarder
 
 public:
   typedef gfxASurface::gfxContentType gfxContentType;
-  typedef LayerManager::LayersBackend LayersBackend;
 
   virtual ~ShadowLayerForwarder();
 
diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp
index 656c29d126d..a5262f8b66a 100644
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -12,6 +12,7 @@
 #include "gfxUtils.h"
 #include "yuv_convert.h"
 #include "GLContextProvider.h"
+#include "LayersBackend.h"
 #if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
 # include "GLXLibrary.h"
 # include "mozilla/X11Util.h"
@@ -172,7 +173,7 @@ AllocateTextureIOSurface(MacIOSurfaceImage *aIOImage, mozilla::gl::GLContext* aG
 
   aGL->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, 0);
 
-  aIOImage->SetBackendData(LayerManager::LAYERS_OPENGL, backendData.forget());
+  aIOImage->SetBackendData(LAYERS_OPENGL, backendData.forget());
 }
 #endif
 
@@ -189,7 +190,7 @@ AllocateTextureIOSurface(GonkIOSurfaceImage *aIOImage, mozilla::gl::GLContext* a
     new GonkIOSurfaceImageOGLBackendData);
 
   backendData->mTexture.Allocate(aGL);
-  aIOImage->SetBackendData(LayerManager::LAYERS_OPENGL, backendData.forget());
+  aIOImage->SetBackendData(LAYERS_OPENGL, backendData.forget());
 }
 #endif
 
@@ -231,18 +232,18 @@ ImageLayerOGL::RenderLayer(int,
     }
 
     PlanarYCbCrOGLBackendData *data =
-      static_cast<PlanarYCbCrOGLBackendData*>(yuvImage->GetBackendData(LayerManager::LAYERS_OPENGL));
+      static_cast<PlanarYCbCrOGLBackendData*>(yuvImage->GetBackendData(LAYERS_OPENGL));
 
     if (data && data->mTextures->GetGLContext() != gl()) {
       // If these textures were allocated by another layer manager,
       // clear them out and re-allocate below.
       data = nsnull;
-      yuvImage->SetBackendData(LayerManager::LAYERS_OPENGL, nsnull);
+      yuvImage->SetBackendData(LAYERS_OPENGL, nsnull);
     }
 
     if (!data) {
       AllocateTexturesYCbCr(yuvImage);
-      data = static_cast<PlanarYCbCrOGLBackendData*>(yuvImage->GetBackendData(LayerManager::LAYERS_OPENGL));
+      data = static_cast<PlanarYCbCrOGLBackendData*>(yuvImage->GetBackendData(LAYERS_OPENGL));
     }
 
     if (!data || data->mTextures->GetGLContext() != gl()) {
@@ -294,18 +295,18 @@ ImageLayerOGL::RenderLayer(int,
                  "Image layer has alpha image");
 
     CairoOGLBackendData *data =
-      static_cast<CairoOGLBackendData*>(cairoImage->GetBackendData(LayerManager::LAYERS_OPENGL));
+      static_cast<CairoOGLBackendData*>(cairoImage->GetBackendData(LAYERS_OPENGL));
 
     if (data && data->mTexture.GetGLContext() != gl()) {
       // If this texture was allocated by another layer manager, clear
       // it out and re-allocate below.
       data = nsnull;
-      cairoImage->SetBackendData(LayerManager::LAYERS_OPENGL, nsnull);
+      cairoImage->SetBackendData(LAYERS_OPENGL, nsnull);
     }
 
     if (!data) {
       AllocateTexturesCairo(cairoImage);
-      data = static_cast<CairoOGLBackendData*>(cairoImage->GetBackendData(LayerManager::LAYERS_OPENGL));
+      data = static_cast<CairoOGLBackendData*>(cairoImage->GetBackendData(LAYERS_OPENGL));
     }
 
     if (!data || data->mTexture.GetGLContext() != gl()) {
@@ -380,19 +381,19 @@ ImageLayerOGL::RenderLayer(int,
 
      gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
 
-     if (!ioImage->GetBackendData(LayerManager::LAYERS_OPENGL)) {
+     if (!ioImage->GetBackendData(LAYERS_OPENGL)) {
        AllocateTextureIOSurface(ioImage, gl());
      }
 
      MacIOSurfaceImageOGLBackendData *data =
-      static_cast<MacIOSurfaceImageOGLBackendData*>(ioImage->GetBackendData(LayerManager::LAYERS_OPENGL));
+      static_cast<MacIOSurfaceImageOGLBackendData*>(ioImage->GetBackendData(LAYERS_OPENGL));
 
      gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
      gl()->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, data->mTexture.GetTextureID());
 
      ShaderProgramOGL *program =
        mOGLManager->GetProgram(gl::RGBARectLayerProgramType, GetMaskLayer());
-     
+
      program->Activate();
      if (program->GetTexCoordMultiplierUniformLocation() != -1) {
        // 2DRect case, get the multiplier right for a sampler2DRect
@@ -400,16 +401,16 @@ ImageLayerOGL::RenderLayer(int,
      } else {
        NS_ASSERTION(0, "no rects?");
      }
-     
-     program->SetLayerQuadRect(nsIntRect(0, 0, 
-                                         ioImage->GetSize().width, 
+
+     program->SetLayerQuadRect(nsIntRect(0, 0,
+                                         ioImage->GetSize().width,
                                          ioImage->GetSize().height));
      program->SetLayerTransform(GetEffectiveTransform());
      program->SetLayerOpacity(GetEffectiveOpacity());
      program->SetRenderOffset(aOffset);
      program->SetTextureUnit(0);
      program->LoadMask(GetMaskLayer());
-    
+
      mOGLManager->BindAndDrawQuad(program);
      gl()->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, 0);
 #endif
@@ -424,11 +425,11 @@ ImageLayerOGL::RenderLayer(int,
     gl()->MakeCurrent();
     gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
 
-    if (!ioImage->GetBackendData(LayerManager::LAYERS_OPENGL)) {
+    if (!ioImage->GetBackendData(LAYERS_OPENGL)) {
       AllocateTextureIOSurface(ioImage, gl());
     }
     GonkIOSurfaceImageOGLBackendData *data =
-      static_cast<GonkIOSurfaceImageOGLBackendData*>(ioImage->GetBackendData(LayerManager::LAYERS_OPENGL));
+      static_cast<GonkIOSurfaceImageOGLBackendData*>(ioImage->GetBackendData(LAYERS_OPENGL));
 
     gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
     gl()->BindExternalBuffer(data->mTexture.GetTextureID(), ioImage->GetNativeBuffer());
@@ -514,7 +515,7 @@ ImageLayerOGL::AllocateTexturesYCbCr(PlanarYCbCrImage *aImage)
   PlanarYCbCrImage::Data &data = aImage->mData;
 
   gl()->MakeCurrent();
- 
+
   mTextureRecycleBin->GetTexture(TextureRecycleBin::TEXTURE_Y, data.mYSize, gl(), &backendData->mTextures[0]);
   SetClamping(gl(), backendData->mTextures[0].GetTextureID());
 
@@ -533,7 +534,7 @@ ImageLayerOGL::AllocateTexturesYCbCr(PlanarYCbCrImage *aImage)
   backendData->mCbCrSize = aImage->mData.mCbCrSize;
   backendData->mTextureRecycleBin = mTextureRecycleBin;
 
-  aImage->SetBackendData(LayerManager::LAYERS_OPENGL, backendData.forget());
+  aImage->SetBackendData(LAYERS_OPENGL, backendData.forget());
 }
 
 void
@@ -566,7 +567,7 @@ ImageLayerOGL::AllocateTexturesCairo(CairoImage *aImage)
       backendData->mLayerProgram = gl::RGBXLayerProgramType;
     }
 
-    aImage->SetBackendData(LayerManager::LAYERS_OPENGL, backendData.forget());
+    aImage->SetBackendData(LAYERS_OPENGL, backendData.forget());
     return;
   }
 #endif
@@ -575,7 +576,7 @@ ImageLayerOGL::AllocateTexturesCairo(CairoImage *aImage)
                                nsIntRect(0,0, aImage->mSize.width, aImage->mSize.height),
                                tex, true);
 
-  aImage->SetBackendData(LayerManager::LAYERS_OPENGL, backendData.forget());
+  aImage->SetBackendData(LAYERS_OPENGL, backendData.forget());
 }
 
 /*
@@ -620,7 +621,7 @@ ImageLayerOGL::LoadAsTexture(GLuint aTextureUnit, gfxIntSize* aSize)
   }
 
   CairoOGLBackendData *data = static_cast<CairoOGLBackendData*>(
-    cairoImage->GetBackendData(LayerManager::LAYERS_OPENGL));
+    cairoImage->GetBackendData(LAYERS_OPENGL));
 
   if (!data) {
     NS_ASSERTION(cairoImage->mSurface->GetContentType() == gfxASurface::CONTENT_ALPHA,
@@ -650,7 +651,7 @@ ImageLayerOGL::LoadAsTexture(GLuint aTextureUnit, gfxIntSize* aSize)
                                     texID, true, nsIntPoint(0,0), false,
                                     aTextureUnit);
 
-    cairoImage->SetBackendData(LayerManager::LAYERS_OPENGL, data);
+    cairoImage->SetBackendData(LAYERS_OPENGL, data);
 
     gl()->MakeCurrent();
     gl()->fActiveTexture(aTextureUnit);
diff --git a/gfx/layers/opengl/LayerManagerOGLProgram.h b/gfx/layers/opengl/LayerManagerOGLProgram.h
index 42dfbe5e0a9..20823cd4c20 100644
--- a/gfx/layers/opengl/LayerManagerOGLProgram.h
+++ b/gfx/layers/opengl/LayerManagerOGLProgram.h
@@ -12,12 +12,13 @@
 
 #include "nsString.h"
 #include "GLContext.h"
-#include "Layers.h"
-
+#include "gfx3DMatrix.h"
 
 namespace mozilla {
 namespace layers {
 
+class Layer;
+
 // The kinds of mask layer a shader can support
 // We rely on the items in this enum being sequential
 enum MaskType {
diff --git a/ipc/glue/IPCMessageUtils.h b/ipc/glue/IPCMessageUtils.h
index c3324dfd445..ea761cde0a3 100644
--- a/ipc/glue/IPCMessageUtils.h
+++ b/ipc/glue/IPCMessageUtils.h
@@ -25,7 +25,7 @@
 #include "nsRect.h"
 #include "nsRegion.h"
 #include "gfxASurface.h"
-#include "Layers.h"
+#include "LayersBackend.h"
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4800 )
@@ -40,15 +40,13 @@
 namespace base { struct FileDescriptor { }; }
 #endif
 
-using mozilla::layers::LayerManager;
-
 namespace mozilla {
 
 typedef gfxASurface::gfxContentType gfxContentType;
 typedef gfxASurface::gfxImageFormat PixelFormat;
 typedef gfxASurface::gfxSurfaceType gfxSurfaceType;
 typedef gfxPattern::GraphicsFilter GraphicsFilterType;
-typedef LayerManager::LayersBackend LayersBackend;
+typedef layers::LayersBackend LayersBackend;
 
 // This is a cross-platform approximation to HANDLE, which we expect
 // to be typedef'd to void* or thereabouts.
@@ -518,10 +516,10 @@ struct ParamTraits<mozilla::GraphicsFilterType>
 {};
 
 template <>
-struct ParamTraits<mozilla::LayersBackend>
-  : public EnumSerializer<mozilla::LayersBackend,
-                          LayerManager::LAYERS_NONE,
-                          LayerManager::LAYERS_LAST>
+struct ParamTraits<mozilla::layers::LayersBackend>
+  : public EnumSerializer<mozilla::layers::LayersBackend,
+                          mozilla::layers::LAYERS_NONE,
+                          mozilla::layers::LAYERS_LAST>
 {};
 
 template <>
diff --git a/layout/base/FrameLayerBuilder.h b/layout/base/FrameLayerBuilder.h
index 258fbd05558..48b1d053705 100644
--- a/layout/base/FrameLayerBuilder.h
+++ b/layout/base/FrameLayerBuilder.h
@@ -20,6 +20,10 @@ class gfxContext;
 class nsRootPresContext;
 
 namespace mozilla {
+namespace layers {
+class ContainerLayer;
+class ThebesLayer;
+}
 
 class FrameLayerBuilder;
 
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 65a7035f53f..2db337031fd 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -20,7 +20,6 @@
 #include "nsISelection.h"
 #include "nsCaret.h"
 #include "plarena.h"
-#include "Layers.h"
 #include "nsRegion.h"
 #include "FrameLayerBuilder.h"
 #include "nsThemeConstants.h"
diff --git a/layout/ipc/PRenderFrame.ipdl b/layout/ipc/PRenderFrame.ipdl
index bcac7c18a9f..49b7f53e15d 100644
--- a/layout/ipc/PRenderFrame.ipdl
+++ b/layout/ipc/PRenderFrame.ipdl
@@ -8,7 +8,7 @@
 include protocol PBrowser;
 include protocol PLayers;
 
-using mozilla::LayersBackend;
+using mozilla::layers::LayersBackend;
 
 namespace mozilla {
 namespace layout {
diff --git a/layout/ipc/RenderFrameChild.cpp b/layout/ipc/RenderFrameChild.cpp
index 9c3c6fe3fe2..abb263ba100 100644
--- a/layout/ipc/RenderFrameChild.cpp
+++ b/layout/ipc/RenderFrameChild.cpp
@@ -7,6 +7,7 @@
 
 #include "RenderFrameChild.h"
 #include "mozilla/layers/ShadowLayersChild.h"
+#include "LayersBackend.h"
 
 using mozilla::layers::PLayersChild;
 using mozilla::layers::ShadowLayersChild;
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index 1360aefeb47..a7de0d750d7 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -21,6 +21,7 @@
 #include "nsSubDocumentFrame.h"
 #include "nsViewportFrame.h"
 #include "RenderFrameParent.h"
+#include "LayersBackend.h"
 
 typedef nsContentView::ViewConfig ViewConfig;
 using namespace mozilla::layers;
@@ -95,7 +96,7 @@ AssertInTopLevelChromeDoc(ContainerLayer* aContainer,
                           nsIFrame* aContainedFrame)
 {
   NS_ASSERTION(
-    (aContainer->Manager()->GetBackendType() != LayerManager::LAYERS_BASIC) ||
+    (aContainer->Manager()->GetBackendType() != mozilla::layers::LAYERS_BASIC) ||
     (aContainedFrame->GetNearestWidget() ==
      static_cast<BasicLayerManager*>(aContainer->Manager())->GetRetainerWidget()),
     "Expected frame to be in top-level chrome document");
@@ -316,7 +317,7 @@ ClearContainer(ContainerLayer* aContainer)
 static bool
 IsTempLayerManager(LayerManager* aManager)
 {
-  return (LayerManager::LAYERS_BASIC == aManager->GetBackendType() &&
+  return (mozilla::layers::LAYERS_BASIC == aManager->GetBackendType() &&
           !static_cast<BasicLayerManager*>(aManager)->IsRetained());
 }
 
@@ -453,7 +454,7 @@ GetFrom(nsFrameLoader* aFrameLoader)
 }
 
 RenderFrameParent::RenderFrameParent(nsFrameLoader* aFrameLoader,
-                                     LayerManager::LayersBackend* aBackendType,
+                                     mozilla::layers::LayersBackend* aBackendType,
                                      int* aMaxTextureSize,
                                      uint64_t* aId)
   : mLayersId(0)
@@ -464,7 +465,7 @@ RenderFrameParent::RenderFrameParent(nsFrameLoader* aFrameLoader,
   mContentViews[FrameMetrics::ROOT_SCROLL_ID] =
     new nsContentView(aFrameLoader, FrameMetrics::ROOT_SCROLL_ID);
 
-  *aBackendType = LayerManager::LAYERS_NONE;
+  *aBackendType = mozilla::layers::LAYERS_NONE;
   *aMaxTextureSize = 0;
   *aId = 0;
 
diff --git a/layout/ipc/RenderFrameParent.h b/layout/ipc/RenderFrameParent.h
index 97c1f16341c..ba033d68b4f 100644
--- a/layout/ipc/RenderFrameParent.h
+++ b/layout/ipc/RenderFrameParent.h
@@ -13,7 +13,7 @@
 
 #include <map>
 #include "nsDisplayList.h"
-#include "Layers.h"
+#include "LayersBackend.h"
 
 class nsContentView;
 class nsFrameLoader;
@@ -41,7 +41,7 @@ public:
   typedef std::map<ViewID, nsRefPtr<nsContentView> > ViewMap;
 
   RenderFrameParent(nsFrameLoader* aFrameLoader,
-                    LayerManager::LayersBackend* aBackendType,
+                    mozilla::layers::LayersBackend* aBackendType,
                     int* aMaxTextureSize,
                     uint64_t* aId);
   virtual ~RenderFrameParent();
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index ca716af2a0d..2e5d87f984e 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -989,7 +989,7 @@ nsWindow::DrawTo(gfxASurface *targetSurface, const nsIntRect &invalidRect)
         event.region = invalidRect;
 
         switch (GetLayerManager(nsnull)->GetBackendType()) {
-            case LayerManager::LAYERS_BASIC: {
+            case mozilla::layers::LAYERS_BASIC: {
 
                 nsRefPtr<gfxContext> ctx = new gfxContext(targetSurface);
 
@@ -1013,7 +1013,7 @@ nsWindow::DrawTo(gfxASurface *targetSurface, const nsIntRect &invalidRect)
                 break;
             }
 
-            case LayerManager::LAYERS_OPENGL: {
+            case mozilla::layers::LAYERS_OPENGL: {
 
                 static_cast<mozilla::layers::LayerManagerOGL*>(GetLayerManager(nsnull))->
                     SetClippingRegion(nsIntRegion(boundsRect));
@@ -1114,7 +1114,7 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
 
     AndroidBridge::Bridge()->HideProgressDialogOnce();
 
-    if (GetLayerManager(nsnull)->GetBackendType() == LayerManager::LAYERS_BASIC) {
+    if (GetLayerManager(nsnull)->GetBackendType() == mozilla::layers::LAYERS_BASIC) {
         if (sNativeWindow) {
             unsigned char *bits;
             int width, height, format, stride;
diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h
index ae8680174e0..343755da933 100644
--- a/widget/android/nsWindow.h
+++ b/widget/android/nsWindow.h
@@ -140,9 +140,9 @@ public:
     NS_IMETHOD OnIMESelectionChange(void);
     virtual nsIMEUpdatePreference GetIMEUpdatePreference();
 
-    LayerManager* GetLayerManager (PLayersChild* aShadowManager = nsnull, 
-                                   LayersBackend aBackendHint = LayerManager::LAYERS_NONE, 
-                                   LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT, 
+    LayerManager* GetLayerManager (PLayersChild* aShadowManager = nsnull,
+                                   LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
+                                   LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                    bool* aAllowRetaining = nsnull);
 
     NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent);
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 454f67473bf..ce0788a8326 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -2551,7 +2551,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
 #endif
 
   LayerManager *layerManager = mGeckoChild->GetLayerManager(nsnull);
-  if (layerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) {
+  if (layerManager->GetBackendType() == mozilla::layers::LAYERS_OPENGL) {
     NSOpenGLContext *glContext;
 
     LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(layerManager);
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index 48e410822cf..a738877fe0b 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -245,7 +245,7 @@ public:
     NS_IMETHOD Invalidate(const nsIntRect &aRect);
     virtual nsresult ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
     virtual LayerManager* GetLayerManager(PLayersChild* aShadowManager = nsnull,
-                                          LayersBackend aBackendHint = LayerManager::LAYERS_NONE,
+                                          LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
                                           LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                           bool* aAllowRetaining = nsnull);
     NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus) ;
diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp
index 8d8bf7e8ff3..3545efb44d6 100644
--- a/widget/gonk/nsWindow.cpp
+++ b/widget/gonk/nsWindow.cpp
@@ -204,12 +204,12 @@ nsWindow::DoDraw(void)
     gWindowToRedraw->mDirtyRegion.SetEmpty();
 
     LayerManager* lm = gWindowToRedraw->GetLayerManager();
-    if (LayerManager::LAYERS_OPENGL == lm->GetBackendType()) {
+    if (mozilla::layers::LAYERS_OPENGL == lm->GetBackendType()) {
         LayerManagerOGL* oglm = static_cast<LayerManagerOGL*>(lm);
         oglm->SetClippingRegion(event.region);
         oglm->SetWorldTransform(sRotationMatrix);
         gWindowToRedraw->mEventCallback(&event);
-    } else if (LayerManager::LAYERS_BASIC == lm->GetBackendType()) {
+    } else if (mozilla::layers::LAYERS_BASIC == lm->GetBackendType()) {
         MOZ_ASSERT(sFramebufferOpen || sUsingOMTC);
         nsRefPtr<gfxASurface> targetSurface;
 
@@ -585,7 +585,7 @@ PRUint32
 nsWindow::GetGLFrameBufferFormat()
 {
     if (mLayerManager &&
-        mLayerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) {
+        mLayerManager->GetBackendType() == mozilla::layers::LAYERS_OPENGL) {
         // We directly map the hardware fb on Gonk.  The hardware fb
         // has RGB format.
         return LOCAL_GL_RGB;
diff --git a/widget/gonk/nsWindow.h b/widget/gonk/nsWindow.h
index 886ca5ab262..8fbf28b9d0f 100644
--- a/widget/gonk/nsWindow.h
+++ b/widget/gonk/nsWindow.h
@@ -83,7 +83,7 @@ public:
     virtual float GetDPI();
     virtual mozilla::layers::LayerManager*
         GetLayerManager(PLayersChild* aShadowManager = nsnull,
-                        LayersBackend aBackendHint = LayerManager::LAYERS_NONE,
+                        LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
                         LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                         bool* aAllowRetaining = nsnull);
     gfxASurface* GetThebesSurface();
diff --git a/widget/gtk2/nsWindow.cpp b/widget/gtk2/nsWindow.cpp
index e0e4b6d4dd1..ffb6195a64e 100644
--- a/widget/gtk2/nsWindow.cpp
+++ b/widget/gtk2/nsWindow.cpp
@@ -610,7 +610,7 @@ nsWindow::Destroy(void)
     /** Need to clean our LayerManager up while still alive */
     if (mLayerManager) {
         nsRefPtr<GLContext> gl = nsnull;
-        if (mLayerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) {
+        if (mLayerManager->GetBackendType() == mozilla::layers::LAYERS_OPENGL) {
             LayerManagerOGL *ogllm = static_cast<LayerManagerOGL*>(mLayerManager.get());
             gl = ogllm->gl();
         }
@@ -2140,7 +2140,7 @@ nsWindow::OnExposeEvent(cairo_t *cr)
 
         return TRUE;
     
-    } else if (GetLayerManager()->GetBackendType() == LayerManager::LAYERS_OPENGL) {
+    } else if (GetLayerManager()->GetBackendType() == mozilla::layers::LAYERS_OPENGL) {
         LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(GetLayerManager());
         manager->SetClippingRegion(event.region);
 
@@ -6204,7 +6204,7 @@ void
 nsWindow::ClearCachedResources()
 {
     if (mLayerManager &&
-        mLayerManager->GetBackendType() == LayerManager::LAYERS_BASIC) {
+        mLayerManager->GetBackendType() == mozilla::layers::LAYERS_BASIC) {
         static_cast<BasicLayerManager*> (mLayerManager.get())->
             ClearCachedResources();
     }
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index 9bc62dca9e2..8d5adcf141a 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -15,7 +15,6 @@
 #include "nsStringGlue.h"
 
 #include "prthread.h"
-#include "Layers.h"
 #include "nsEvent.h"
 #include "nsCOMPtr.h"
 #include "nsITheme.h"
@@ -23,6 +22,7 @@
 #include "nsWidgetInitData.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
+#include "LayersBackend.h"
 
 // forward declarations
 class   nsFontMetrics;
@@ -41,6 +41,7 @@ namespace dom {
 class TabChild;
 }
 namespace layers {
+class LayerManager;
 class PLayersChild;
 }
 }
@@ -363,7 +364,7 @@ class nsIWidget : public nsISupports {
 
   public:
     typedef mozilla::layers::LayerManager LayerManager;
-    typedef LayerManager::LayersBackend LayersBackend;
+    typedef mozilla::layers::LayersBackend LayersBackend;
     typedef mozilla::layers::PLayersChild PLayersChild;
     typedef mozilla::widget::IMEState IMEState;
     typedef mozilla::widget::InputContext InputContext;
@@ -1040,14 +1041,14 @@ class nsIWidget : public nsISupports {
      */
     inline LayerManager* GetLayerManager(bool* aAllowRetaining = nsnull)
     {
-        return GetLayerManager(nsnull, LayerManager::LAYERS_NONE,
+        return GetLayerManager(nsnull, mozilla::layers::LAYERS_NONE,
                                LAYER_MANAGER_CURRENT, aAllowRetaining);
     }
 
     inline LayerManager* GetLayerManager(LayerManagerPersistence aPersistence,
                                          bool* aAllowRetaining = nsnull)
     {
-        return GetLayerManager(nsnull, LayerManager::LAYERS_NONE,
+        return GetLayerManager(nsnull, mozilla::layers::LAYERS_NONE,
                                aPersistence, aAllowRetaining);
     }
 
diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp
index 04a3df1b854..c950f140251 100644
--- a/widget/qt/nsWindow.cpp
+++ b/widget/qt/nsWindow.cpp
@@ -1040,7 +1040,7 @@ nsWindow::DoPaint(QPainter* aPainter, const QStyleOptionGraphicsItem* aOption, Q
         startup->RemoveFakeLayout();
     }
 
-    if (GetLayerManager(nsnull)->GetBackendType() == LayerManager::LAYERS_OPENGL) {
+    if (GetLayerManager(nsnull)->GetBackendType() == mozilla::layers::LAYERS_OPENGL) {
         aPainter->beginNativePainting();
         nsPaintEvent event(true, NS_PAINT, this);
         event.willSendDidPaint = true;
@@ -3308,7 +3308,7 @@ PRUint32
 nsWindow::GetGLFrameBufferFormat()
 {
     if (mLayerManager &&
-        mLayerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) {
+        mLayerManager->GetBackendType() == mozilla::layers::LAYERS_OPENGL) {
         // On maemo the hardware fb has RGB format.
 #ifdef MOZ_PLATFORM_MAEMO
         return LOCAL_GL_RGB;
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index c4a24f9c301..8b3955e078a 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -1339,7 +1339,7 @@ NS_METHOD nsWindow::Move(PRInt32 aX, PRInt32 aY)
     // region, some drivers or OSes may incorrectly copy into the clipped-out
     // area.
     if (mWindowType == eWindowType_plugin &&
-        (!mLayerManager || mLayerManager->GetBackendType() == LayerManager::LAYERS_D3D9) &&
+        (!mLayerManager || mLayerManager->GetBackendType() == LAYERS_D3D9) &&
         mClipRects &&
         (mClipRectCount != 1 || !mClipRects[0].IsEqualInterior(nsIntRect(0, 0, mBounds.width, mBounds.height)))) {
       flags |= SWP_NOCOPYBITS;
@@ -3140,11 +3140,10 @@ nsWindow::GetLayerManager(PLayersChild* aShadowManager,
 
 #ifdef MOZ_ENABLE_D3D10_LAYER
   if (mLayerManager) {
-    if (mLayerManager->GetBackendType() ==
-        mozilla::layers::LayerManager::LAYERS_D3D10)
+    if (mLayerManager->GetBackendType() == LAYERS_D3D10)
     {
-      mozilla::layers::LayerManagerD3D10 *layerManagerD3D10 =
-        static_cast<mozilla::layers::LayerManagerD3D10*>(mLayerManager.get());
+      LayerManagerD3D10 *layerManagerD3D10 =
+        static_cast<LayerManagerD3D10*>(mLayerManager.get());
       if (layerManagerD3D10->device() !=
           gfxWindowsPlatform::GetPlatform()->GetD3D10Device())
       {
@@ -3160,8 +3159,7 @@ nsWindow::GetLayerManager(PLayersChild* aShadowManager,
 
   if (!mLayerManager ||
       (!sAllowD3D9 && aPersistence == LAYER_MANAGER_PERSISTENT &&
-        mLayerManager->GetBackendType() == 
-        mozilla::layers::LayerManager::LAYERS_BASIC)) {
+        mLayerManager->GetBackendType() == LAYERS_BASIC)) {
     // If D3D9 is not currently allowed but the permanent manager is required,
     // -and- we're currently using basic layers, run through this check.
     LayerManagerPrefs prefs;
@@ -3187,8 +3185,8 @@ nsWindow::GetLayerManager(PLayersChild* aShadowManager,
 
 #ifdef MOZ_ENABLE_D3D10_LAYER
       if (!prefs.mPreferD3D9 && !prefs.mPreferOpenGL) {
-        nsRefPtr<mozilla::layers::LayerManagerD3D10> layerManager =
-          new mozilla::layers::LayerManagerD3D10(this);
+        nsRefPtr<LayerManagerD3D10> layerManager =
+          new LayerManagerD3D10(this);
         if (layerManager->Initialize(prefs.mForceAcceleration)) {
           mLayerManager = layerManager;
         }
@@ -3196,8 +3194,8 @@ nsWindow::GetLayerManager(PLayersChild* aShadowManager,
 #endif
 #ifdef MOZ_ENABLE_D3D9_LAYER
       if (!prefs.mPreferOpenGL && !mLayerManager && sAllowD3D9) {
-        nsRefPtr<mozilla::layers::LayerManagerD3D9> layerManager =
-          new mozilla::layers::LayerManagerD3D9(this);
+        nsRefPtr<LayerManagerD3D9> layerManager =
+          new LayerManagerD3D9(this);
         if (layerManager->Initialize(prefs.mForceAcceleration)) {
           mLayerManager = layerManager;
         }
@@ -3212,8 +3210,8 @@ nsWindow::GetLayerManager(PLayersChild* aShadowManager,
         }
 
         if (status == nsIGfxInfo::FEATURE_NO_INFO) {
-          nsRefPtr<mozilla::layers::LayerManagerOGL> layerManager =
-            new mozilla::layers::LayerManagerOGL(this);
+          nsRefPtr<LayerManagerOGL> layerManager =
+            new LayerManagerOGL(this);
           if (layerManager->Initialize()) {
             mLayerManager = layerManager;
           }
@@ -6778,7 +6776,7 @@ nsWindow::ConfigureChildren(const nsTArray<Configuration>& aConfigurations)
 
       if (gfxWindowsPlatform::GetPlatform()->GetRenderMode() ==
           gfxWindowsPlatform::RENDER_DIRECT2D ||
-          GetLayerManager()->GetBackendType() != LayerManager::LAYERS_BASIC) {
+          GetLayerManager()->GetBackendType() != LAYERS_BASIC) {
         // XXX - Workaround for Bug 587508. This will invalidate the part of the
         // plugin window that might be touched by moving content somehow. The
         // underlying problem should be found and fixed!
@@ -7751,7 +7749,7 @@ nsWindow::ClearCachedResources()
     mD2DWindowSurface = nsnull;
 #endif
     if (mLayerManager &&
-        mLayerManager->GetBackendType() == LayerManager::LAYERS_BASIC) {
+        mLayerManager->GetBackendType() == LAYERS_BASIC) {
       static_cast<BasicLayerManager*>(mLayerManager.get())->
         ClearCachedResources();
     }
diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
index 2882f3d88b0..a07bc57fcd1 100644
--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
@@ -132,7 +132,7 @@ public:
   NS_IMETHOD              GetAttention(PRInt32 aCycleCount);
   virtual bool            HasPendingInputEvent();
   virtual LayerManager*   GetLayerManager(PLayersChild* aShadowManager = nsnull,
-                                          LayersBackend aBackendHint = LayerManager::LAYERS_NONE,
+                                          LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
                                           LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                           bool* aAllowRetaining = nsnull);
   gfxASurface             *GetThebesSurface();
diff --git a/widget/windows/nsWindowGfx.cpp b/widget/windows/nsWindowGfx.cpp
index 4c96520da3c..0201356dcab 100644
--- a/widget/windows/nsWindowGfx.cpp
+++ b/widget/windows/nsWindowGfx.cpp
@@ -70,7 +70,7 @@ using namespace mozilla::widget;
 /**************************************************************
  *
  * SECTION: nsWindow statics
- * 
+ *
  **************************************************************/
 
 static nsAutoPtr<PRUint8>  sSharedSurfaceData;
@@ -304,7 +304,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
 #endif // WIDGET_DEBUG_OUTPUT
 
     switch (GetLayerManager()->GetBackendType()) {
-      case LayerManager::LAYERS_BASIC:
+      case LAYERS_BASIC:
         {
           nsRefPtr<gfxASurface> targetSurface;
 
@@ -535,13 +535,13 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
           }
         }
         break;
-      case LayerManager::LAYERS_OPENGL:
+      case LAYERS_OPENGL:
         static_cast<mozilla::layers::LayerManagerOGL*>(GetLayerManager())->
           SetClippingRegion(event.region);
         result = DispatchWindowEvent(&event, eventStatus);
         break;
 #ifdef MOZ_ENABLE_D3D9_LAYER
-      case LayerManager::LAYERS_D3D9:
+      case LAYERS_D3D9:
         {
           LayerManagerD3D9 *layerManagerD3D9 =
             static_cast<mozilla::layers::LayerManagerD3D9*>(GetLayerManager());
@@ -559,7 +559,7 @@ bool nsWindow::OnPaint(HDC aDC, PRUint32 aNestingLevel)
         break;
 #endif
 #ifdef MOZ_ENABLE_D3D10_LAYER
-      case LayerManager::LAYERS_D3D10:
+      case LAYERS_D3D10:
         {
           gfxWindowsPlatform::GetPlatform()->UpdateRenderMode();
           LayerManagerD3D10 *layerManagerD3D10 = static_cast<mozilla::layers::LayerManagerD3D10*>(GetLayerManager());
diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp
index 9b96181a11b..e5e16e30b13 100644
--- a/widget/xpwidgets/PuppetWidget.cpp
+++ b/widget/xpwidgets/PuppetWidget.cpp
@@ -290,7 +290,7 @@ PuppetWidget::GetLayerManager(PLayersChild* aShadowManager,
     // The backend hint is a temporary placeholder until Azure, when
     // all content-process layer managers will be BasicLayerManagers.
 #if defined(MOZ_ENABLE_D3D10_LAYER)
-    if (LayerManager::LAYERS_D3D10 == aBackendHint) {
+    if (mozilla::layers::LAYERS_D3D10 == aBackendHint) {
       nsRefPtr<LayerManagerD3D10> m = new LayerManagerD3D10(this);
       m->AsShadowForwarder()->SetShadowManager(aShadowManager);
       if (m->Initialize()) {
@@ -498,7 +498,7 @@ PuppetWidget::DispatchPaintEvent()
                          nsCAutoString("PuppetWidget"), nsnull);
 #endif
 
-    if (LayerManager::LAYERS_D3D10 == mLayerManager->GetBackendType()) {
+    if (mozilla::layers::LAYERS_D3D10 == mLayerManager->GetBackendType()) {
       DispatchEvent(&event, status);
     } else {
       nsRefPtr<gfxContext> ctx = new gfxContext(mSurface);
diff --git a/widget/xpwidgets/PuppetWidget.h b/widget/xpwidgets/PuppetWidget.h
index d6fa70de54e..ae3e82fca64 100644
--- a/widget/xpwidgets/PuppetWidget.h
+++ b/widget/xpwidgets/PuppetWidget.h
@@ -21,6 +21,7 @@
 #include "nsThreadUtils.h"
 #include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
+#include "LayersBackend.h"
 
 class gfxASurface;
 
@@ -135,7 +136,7 @@ public:
 //NS_IMETHOD              CaptureMouse(bool aCapture);
   virtual LayerManager*
   GetLayerManager(PLayersChild* aShadowManager = nsnull,
-                  LayersBackend aBackendHint = LayerManager::LAYERS_NONE,
+                  LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
                   LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                   bool* aAllowRetaining = nsnull);
 //  virtual nsDeviceContext* GetDeviceContext();
diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/xpwidgets/nsBaseWidget.cpp
index 6ee14d13e17..67f0023dfe6 100644
--- a/widget/xpwidgets/nsBaseWidget.cpp
+++ b/widget/xpwidgets/nsBaseWidget.cpp
@@ -145,7 +145,7 @@ void nsBaseWidget::DestroyCompositor()
 nsBaseWidget::~nsBaseWidget()
 {
   if (mLayerManager &&
-      mLayerManager->GetBackendType() == LayerManager::LAYERS_BASIC) {
+      mLayerManager->GetBackendType() == LAYERS_BASIC) {
     static_cast<BasicLayerManager*>(mLayerManager.get())->ClearRetainerWidget();
   }
 
@@ -737,7 +737,7 @@ nsBaseWidget::AutoLayerManagerSetup::AutoLayerManagerSetup(
   BasicLayerManager* manager =
     static_cast<BasicLayerManager*>(mWidget->GetLayerManager());
   if (manager) {
-    NS_ASSERTION(manager->GetBackendType() == LayerManager::LAYERS_BASIC,
+    NS_ASSERTION(manager->GetBackendType() == LAYERS_BASIC,
       "AutoLayerManagerSetup instantiated for non-basic layer backend!");
     manager->SetDefaultTarget(aTarget, aDoubleBuffering);
   }
@@ -748,7 +748,7 @@ nsBaseWidget::AutoLayerManagerSetup::~AutoLayerManagerSetup()
   BasicLayerManager* manager =
     static_cast<BasicLayerManager*>(mWidget->GetLayerManager());
   if (manager) {
-    NS_ASSERTION(manager->GetBackendType() == LayerManager::LAYERS_BASIC,
+    NS_ASSERTION(manager->GetBackendType() == LAYERS_BASIC,
       "AutoLayerManagerSetup instantiated for non-basic layer backend!");
     manager->SetDefaultTarget(nsnull, BasicLayerManager::BUFFER_NONE);
   }
@@ -878,9 +878,9 @@ void nsBaseWidget::CreateCompositor()
   mCompositorChild->Open(parentChannel, childMessageLoop, childSide);
   PRInt32 maxTextureSize;
   PLayersChild* shadowManager;
-  LayerManager::LayersBackend backendHint =
-    mUseAcceleratedRendering ? LayerManager::LAYERS_OPENGL : LayerManager::LAYERS_BASIC;
-  LayerManager::LayersBackend parentBackend;
+  mozilla::layers::LayersBackend backendHint =
+    mUseAcceleratedRendering ? mozilla::layers::LAYERS_OPENGL : mozilla::layers::LAYERS_BASIC;
+  mozilla::layers::LayersBackend parentBackend;
   shadowManager = mCompositorChild->SendPLayersConstructor(
     backendHint, 0, &parentBackend, &maxTextureSize);
 
@@ -1314,7 +1314,7 @@ PRUint32
 nsBaseWidget::GetGLFrameBufferFormat()
 {
   if (mLayerManager &&
-      mLayerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) {
+      mLayerManager->GetBackendType() == LAYERS_OPENGL) {
     // Assume that the default framebuffer has RGBA format.  Specific
     // backends that know differently will override this method.
     return LOCAL_GL_RGBA;
diff --git a/widget/xpwidgets/nsBaseWidget.h b/widget/xpwidgets/nsBaseWidget.h
index 821c50d1709..895973bbe1b 100644
--- a/widget/xpwidgets/nsBaseWidget.h
+++ b/widget/xpwidgets/nsBaseWidget.h
@@ -15,6 +15,7 @@
 #include "nsAutoPtr.h"
 #include "BasicLayers.h"
 #include "nsIRollupListener.h"
+#include "LayersBackend.h"
 
 class nsIContent;
 class nsAutoRollup;
@@ -98,7 +99,7 @@ public:
   NS_IMETHOD              MakeFullScreen(bool aFullScreen);
   virtual nsDeviceContext* GetDeviceContext();
   virtual LayerManager*   GetLayerManager(PLayersChild* aShadowManager = nsnull,
-                                          LayersBackend aBackendHint = LayerManager::LAYERS_NONE,
+                                          LayersBackend aBackendHint = mozilla::layers::LAYERS_NONE,
                                           LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                           bool* aAllowRetaining = nsnull);
 

From ae53abdf98b3f0bc31e18fe3be4ec45aaeaae875 Mon Sep 17 00:00:00 2001
From: David Zbarsky <dzbarsky@gmail.com>
Date: Wed, 18 Jul 2012 12:47:37 -0400
Subject: [PATCH 068/118] [Bug 774751] Use nsRefPtr in nsIDocument r=bz

---
 content/base/public/nsIDocument.h | 41 ++++------------------
 content/base/src/nsDocument.cpp   | 58 +++++++++++++++++++------------
 2 files changed, 42 insertions(+), 57 deletions(-)

diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index e8a1053709d..062c91b6e0c 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -19,7 +19,6 @@
 #include "nsTObserverArray.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
-#include "nsNodeInfoManager.h"
 #include "nsIVariant.h"
 #include "nsIObserver.h"
 #include "nsGkAtoms.h"
@@ -126,28 +125,9 @@ public:
   NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
 
 #ifdef MOZILLA_INTERNAL_API
-  nsIDocument()
-    : nsINode(nsnull),
-      mCharacterSet(NS_LITERAL_CSTRING("ISO-8859-1")),
-      mNodeInfoManager(nsnull),
-      mCompatMode(eCompatibility_FullStandards),
-      mIsInitialDocumentInWindow(false),
-      mMayStartLayout(true),
-      mVisible(true),
-      mRemovedFromDocShell(false),
-      // mAllowDNSPrefetch starts true, so that we can always reliably && it
-      // with various values that might disable it.  Since we never prefetch
-      // unless we get a window, and in that case the docshell value will get
-      // &&-ed in, this is safe.
-      mAllowDNSPrefetch(true),
-      mIsBeingUsedAsImage(false),
-      mHasLinksToUpdate(false),
-      mPartID(0)
-  {
-    SetInDocument();
-  }
+  nsIDocument();
 #endif
-  
+
   /**
    * Let the document know that we're starting to load data into it.
    * @param aCommand The parser command. Must not be null.
@@ -1683,14 +1663,7 @@ private:
   PRUint64 mWarnedAbout;
 
 protected:
-  ~nsIDocument()
-  {
-    // XXX The cleanup of mNodeInfoManager (calling DropDocumentReference and
-    //     releasing it) happens in the nsDocument destructor. We'd prefer to
-    //     do it here but nsNodeInfoManager is a concrete class that we don't
-    //     want to expose to users of the nsIDocument API outside of Gecko.
-  }
-
+  ~nsIDocument();
   nsPropertyTable* GetExtraPropertyTable(PRUint16 aCategory);
 
   // Never ever call this. Only call GetWindow!
@@ -1747,11 +1720,9 @@ protected:
   // A reference to the element last returned from GetRootElement().
   mozilla::dom::Element* mCachedRootElement;
 
-  // We'd like these to be nsRefPtrs, but that'd require us to include
-  // additional headers that we don't want to expose.
-  // The cleanup is handled by the nsDocument destructor.
+  // We hold a strong reference to mNodeInfoManager through mNodeInfo
   nsNodeInfoManager* mNodeInfoManager; // [STRONG]
-  mozilla::css::Loader* mCSSLoader; // [STRONG]
+  nsRefPtr<mozilla::css::Loader> mCSSLoader;
   nsHTMLStyleSheet* mAttrStyleSheet;
 
   // The set of all object, embed, applet, video and audio elements for
@@ -1759,7 +1730,7 @@ protected:
   // These are non-owning pointers, the elements are responsible for removing
   // themselves when they go away.
   nsAutoPtr<nsTHashtable<nsPtrHashKey<nsIContent> > > mFreezableElements;
-  
+
   // The set of all links that need their status resolved.  Links must add themselves
   // to this set by calling RegisterPendingLinkUpdate when added to a document and must
   // remove themselves by calling UnregisterPendingLinkUpdate when removed from a document.
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index bec53100a44..2fbb03a8aaf 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1494,9 +1494,29 @@ nsDOMImplementation::CreateHTMLDocument(const nsAString& aTitle,
 // ==================================================================
 // =
 // ==================================================================
+nsIDocument::nsIDocument()
+  : nsINode(nsnull),
+    mCharacterSet(NS_LITERAL_CSTRING("ISO-8859-1")),
+    mNodeInfoManager(nsnull),
+    mCompatMode(eCompatibility_FullStandards),
+    mIsInitialDocumentInWindow(false),
+    mMayStartLayout(true),
+    mVisible(true),
+    mRemovedFromDocShell(false),
+    // mAllowDNSPrefetch starts true, so that we can always reliably && it
+    // with various values that might disable it.  Since we never prefetch
+    // unless we get a window, and in that case the docshell value will get
+    // &&-ed in, this is safe.
+    mAllowDNSPrefetch(true),
+    mIsBeingUsedAsImage(false),
+    mHasLinksToUpdate(false),
+    mPartID(0)
+{
+  SetInDocument();
+}
 
-  // NOTE! nsDocument::operator new() zeroes out all members, so don't
-  // bother initializing members to 0.
+// NOTE! nsDocument::operator new() zeroes out all members, so don't
+// bother initializing members to 0.
 
 nsDocument::nsDocument(const char* aContentType)
   : nsIDocument()
@@ -1504,7 +1524,7 @@ nsDocument::nsDocument(const char* aContentType)
   , mVisibilityState(eHidden)
 {
   SetContentTypeInternal(nsDependentCString(aContentType));
-  
+
 #ifdef PR_LOGGING
   if (!gDocumentLeakPRLog)
     gDocumentLeakPRLog = PR_NewLogModule("DocumentLeak");
@@ -1519,7 +1539,7 @@ nsDocument::nsDocument(const char* aContentType)
 
   // Start out mLastStyleSheetSet as null, per spec
   SetDOMStringToNull(mLastStyleSheetSet);
-  
+
   mLinksToUpdate.Init();
 }
 
@@ -1532,6 +1552,14 @@ ClearAllBoxObjects(nsIContent* aKey, nsPIBoxObject* aBoxObject, void* aUserArg)
   return PL_DHASH_NEXT;
 }
 
+nsIDocument::~nsIDocument()
+{
+  if (mNodeInfoManager) {
+    mNodeInfoManager->DropDocumentReference();
+  }
+}
+
+
 nsDocument::~nsDocument()
 {
 #ifdef PR_LOGGING
@@ -1613,12 +1641,6 @@ nsDocument::~nsDocument()
   if (mCSSLoader) {
     // Could be null here if Init() failed
     mCSSLoader->DropDocumentReference();
-    NS_RELEASE(mCSSLoader);
-  }
-
-  // XXX Ideally we'd do this cleanup in the nsIDocument destructor.
-  if (mNodeInfoManager) {
-    mNodeInfoManager->DropDocumentReference();
   }
 
   delete mHeaderData;
@@ -1910,7 +1932,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMARRAY(mPreloadingImages)
 
-  
+
   if (tmp->mBoxObjectTable) {
    tmp->mBoxObjectTable->EnumerateRead(ClearAllBoxObjects, nsnull);
    delete tmp->mBoxObjectTable;
@@ -1931,7 +1953,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
   tmp->mFrameRequestCallbacks.Clear();
 
   tmp->mRadioGroups.Clear();
-  
+
   // nsDocument has a pretty complex destructor, so we're going to
   // assume that *most* cycles you actually want to break somewhere
   // else, and not unlink an awful lot here.
@@ -1943,7 +1965,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
   }
 
   tmp->mPendingTitleChangeEvent.Revoke();
-  
+
   tmp->mInUnlinkOrDeletion = false;
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
@@ -1961,7 +1983,6 @@ nsDocument::Init()
 
   // Force initialization.
   nsINode::nsSlots* slots = GetSlots();
-  NS_ENSURE_TRUE(slots,NS_ERROR_OUT_OF_MEMORY);
 
   // Prepend self as mutation-observer whether we need it or not (some
   // subclasses currently do, other don't). This is because the code in
@@ -1972,17 +1993,11 @@ nsDocument::Init()
 
 
   mOnloadBlocker = new nsOnloadBlocker();
-  NS_ENSURE_TRUE(mOnloadBlocker, NS_ERROR_OUT_OF_MEMORY);
-
   mCSSLoader = new mozilla::css::Loader(this);
-  NS_ENSURE_TRUE(mCSSLoader, NS_ERROR_OUT_OF_MEMORY);
-  NS_ADDREF(mCSSLoader);
   // Assume we're not quirky, until we know otherwise
   mCSSLoader->SetCompatibilityMode(eCompatibility_FullStandards);
 
   mNodeInfoManager = new nsNodeInfoManager();
-  NS_ENSURE_TRUE(mNodeInfoManager, NS_ERROR_OUT_OF_MEMORY);
-
   nsresult  rv = mNodeInfoManager->Init(this);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1995,7 +2010,6 @@ nsDocument::Init()
   NS_ASSERTION(OwnerDoc() == this, "Our nodeinfo is busted!");
 
   mScriptLoader = new nsScriptLoader(this);
-  NS_ENSURE_TRUE(mScriptLoader, NS_ERROR_OUT_OF_MEMORY);
 
   mImageTracker.Init();
   mPlugins.Init();
@@ -2003,7 +2017,7 @@ nsDocument::Init()
   return NS_OK;
 }
 
-void 
+void
 nsIDocument::DeleteAllProperties()
 {
   for (PRUint32 i = 0; i < GetPropertyTableCount(); ++i) {

From 5b0cdffc1b86ea6d80f21a11e3f7ebe38fd3f0d5 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Wed, 18 Jul 2012 15:24:34 -0400
Subject: [PATCH 069/118] Bug 772531 - detect when a tegra reboots via log file
 parsing, mark test as red and allow tbpl to get accurate information. r=wlach

---
 build/mobile/devicemanagerSUT.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/mobile/devicemanagerSUT.py b/build/mobile/devicemanagerSUT.py
index 822b17fabcd..101f093989a 100644
--- a/build/mobile/devicemanagerSUT.py
+++ b/build/mobile/devicemanagerSUT.py
@@ -222,7 +222,7 @@ class DeviceManagerSUT(DeviceManager):
             self._sock = None
             # This error shows up with we have our tegra rebooted.
             if err[0] == errno.ECONNRESET:
-              raise AgentError("Automation error: Error receiving data from socket (possible reboot). cmd=%s; err=%s" % (cmd, err), True)
+              raise AgentError("Automation error: Error receiving data from socket (possible reboot). cmd=%s; err=%s" % (cmd, err))
             raise AgentError("Error receiving data from socket. cmd=%s; err=%s" % (cmd, err))
 
           data += temp

From 3cf1526c5212ed89017e3d80afa5f3043c2c21a5 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Wed, 18 Jul 2012 12:43:06 -0700
Subject: [PATCH 070/118] Bug 774989: Transform touch-event coordinates for
 remote content. r=smaug

---
 content/events/src/nsEventStateManager.cpp | 43 ++++++++++++++++++----
 content/events/src/nsEventStateManager.h   |  2 +-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 70719cd2699..0b25fbd6ea8 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -1637,10 +1637,9 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext,
 
 bool
 nsEventStateManager::DispatchCrossProcessEvent(nsEvent* aEvent,
-                                               nsIFrameLoader* aFrameLoader,
+                                               nsFrameLoader* aFrameLoader,
                                                nsEventStatus *aStatus) {
-  nsFrameLoader* fml = static_cast<nsFrameLoader*>(aFrameLoader);
-  PBrowserParent* remoteBrowser = fml->GetRemoteBrowser();
+  PBrowserParent* remoteBrowser = aFrameLoader->GetRemoteBrowser();
   TabParent* remote = static_cast<TabParent*>(remoteBrowser);
   if (!remote) {
     return false;
@@ -1788,6 +1787,10 @@ nsEventStateManager::HandleCrossProcessEvent(nsEvent *aEvent,
     }
   }
 
+  if (targets.Length() == 0) {
+    return false;
+  }
+
   // Look up the frame loader for all the remote targets we found, and
   // then dispatch the event to the remote content they represent.
   bool dispatched = false;
@@ -1795,22 +1798,46 @@ nsEventStateManager::HandleCrossProcessEvent(nsEvent *aEvent,
     nsIContent* target = targets[i];
     nsCOMPtr<nsIFrameLoaderOwner> loaderOwner = do_QueryInterface(target);
     if (!loaderOwner) {
-      return false;
+      continue;
     }
 
     nsRefPtr<nsFrameLoader> frameLoader = loaderOwner->GetFrameLoader();
     if (!frameLoader) {
-      return false;
+      continue;
     }
 
     PRUint32 eventMode;
     frameLoader->GetEventMode(&eventMode);
     if (eventMode == nsIFrameLoader::EVENT_MODE_DONT_FORWARD_TO_CHILD) {
-      return false;
+      continue;
     }
 
-    nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, aTargetFrame);
-    aEvent->refPoint = pt.ToNearestPixels(mPresContext->AppUnitsPerDevPixel());
+    // The "toplevel widget" in content processes is always at position
+    // 0,0.  Map the event coordinates to match that.
+    if (aEvent->eventStructType != NS_TOUCH_EVENT) {
+      nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent,
+                                                                aTargetFrame);
+      aEvent->refPoint =
+        pt.ToNearestPixels(mPresContext->AppUnitsPerDevPixel());
+    } else {
+      nsIFrame* targetFrame = frameLoader->GetPrimaryFrameOfOwningContent();
+      aEvent->refPoint = nsIntPoint();
+      // Find out how far we're offset from the nearest widget.
+      nsPoint offset =
+        nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, targetFrame);
+      nsIntPoint intOffset =
+        offset.ToNearestPixels(mPresContext->AppUnitsPerDevPixel());
+      nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aEvent);
+      // Then offset all the touch points by that distance, to put them
+      // in the space where top-left is 0,0.
+      const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+      for (PRUint32 i = 0; i < touches.Length(); ++i) {
+        nsIDOMTouch* touch = touches[i];
+        if (touch) {
+          touch->mRefPoint += intOffset;
+        }
+      }
+    }
 
     dispatched |= DispatchCrossProcessEvent(aEvent, frameLoader, aStatus);
   }
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index d7349dc8ed9..19a8ed6affa 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -447,7 +447,7 @@ protected:
   mozilla::dom::TabParent *GetCrossProcessTarget();
   bool IsTargetCrossProcess(nsGUIEvent *aEvent);
 
-  bool DispatchCrossProcessEvent(nsEvent* aEvent, nsIFrameLoader* remote,
+  bool DispatchCrossProcessEvent(nsEvent* aEvent, nsFrameLoader* remote,
                                  nsEventStatus *aStatus);
   bool HandleCrossProcessEvent(nsEvent *aEvent,
                                  nsIFrame* aTargetFrame,

From e82547c80de2562062ea72ae51e9260259cdb7f7 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <amccreight@mozilla.com>
Date: Wed, 18 Jul 2012 13:28:58 -0700
Subject: [PATCH 071/118] Bug 761831 - Be less ambitious in GetMemberInfo.
 r=bholley

---
 js/xpconnect/crashtests/761831.html     | 23 +++++++++++++
 js/xpconnect/crashtests/crashtests.list |  1 +
 js/xpconnect/src/XPCQuickStubs.cpp      | 44 ++++++++++++-------------
 3 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 js/xpconnect/crashtests/761831.html

diff --git a/js/xpconnect/crashtests/761831.html b/js/xpconnect/crashtests/761831.html
new file mode 100644
index 00000000000..60fdd6d983a
--- /dev/null
+++ b/js/xpconnect/crashtests/761831.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+function boom()
+{
+  function removeRoot() {
+    window.removeEventListener("DOMNodeRemoved", removeRoot, true);
+    document.open();
+  }
+
+  window.addEventListener("DOMNodeRemoved", removeRoot, true);
+
+  var r = document.documentElement;
+  document.removeChild(r);
+}
+
+</script>
+</head>
+
+<body onload="boom();"></body>
+</html>
diff --git a/js/xpconnect/crashtests/crashtests.list b/js/xpconnect/crashtests/crashtests.list
index fc1badda168..306a7ed8b4f 100644
--- a/js/xpconnect/crashtests/crashtests.list
+++ b/js/xpconnect/crashtests/crashtests.list
@@ -39,6 +39,7 @@ load 720305-1.html
 load 723465.html
 load 732870.html
 load 751995.html
+load 761831.html
 asserts(0-1) load 752038.html # We may hit bug 645229 here.
 asserts(1) load 753162.html # We hit bug 675518 or bug 680086 here.
 load 754311.html
diff --git a/js/xpconnect/src/XPCQuickStubs.cpp b/js/xpconnect/src/XPCQuickStubs.cpp
index b5fc28851b6..439db06e41b 100644
--- a/js/xpconnect/src/XPCQuickStubs.cpp
+++ b/js/xpconnect/src/XPCQuickStubs.cpp
@@ -363,31 +363,31 @@ xpc_qsThrow(JSContext *cx, nsresult rv)
 static void
 GetMemberInfo(JSObject *obj, jsid memberId, const char **ifaceName)
 {
-    // Get the interface name.  From DefinePropertyIfFound (in
-    // xpcwrappednativejsops.cpp) and XPCThrower::Verbosify.
-    //
-    // We could instead make the quick stub could pass in its interface name,
-    // but this code often produces a more specific error message, e.g.
     *ifaceName = "Unknown";
 
-    NS_ASSERTION(IS_WRAPPER_CLASS(js::GetObjectClass(obj)) ||
-                 js::GetObjectClass(obj) == &XPC_WN_Tearoff_JSClass,
-                 "obj must be a wrapper");
-    XPCWrappedNativeProto *proto;
-    if (IS_SLIM_WRAPPER(obj)) {
-        proto = GetSlimWrapperProto(obj);
-    } else {
-        XPCWrappedNative *wrapper = (XPCWrappedNative *) js::GetObjectPrivate(obj);
-        proto = wrapper->GetProto();
-    }
-    if (proto) {
-        XPCNativeSet *set = proto->GetSet();
-        if (set) {
-            XPCNativeMember *member;
-            XPCNativeInterface *iface;
+    // Don't try to generate a useful name if there are security wrappers,
+    // because it isn't worth the risk of something going wrong just to generate
+    // an error message. Instead, only handle the simple case where we have the
+    // reflector in hand.
+    if (IS_WRAPPER_CLASS(js::GetObjectClass(obj))) {
+        XPCWrappedNativeProto *proto;
+        if (IS_SLIM_WRAPPER_OBJECT(obj)) {
+            proto = GetSlimWrapperProto(obj);
+        } else {
+            MOZ_ASSERT(IS_WN_WRAPPER_OBJECT(obj));
+            XPCWrappedNative *wrapper =
+                static_cast<XPCWrappedNative *>(js::GetObjectPrivate(obj));
+            proto = wrapper->GetProto();
+        }
+        if (proto) {
+            XPCNativeSet *set = proto->GetSet();
+            if (set) {
+                XPCNativeMember *member;
+                XPCNativeInterface *iface;
 
-            if (set->FindMember(memberId, &member, &iface))
-                *ifaceName = iface->GetNameString();
+                if (set->FindMember(memberId, &member, &iface))
+                    *ifaceName = iface->GetNameString();
+            }
         }
     }
 }

From a629d6f9aec42d10c721c83337cdee97a6568218 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Wed, 18 Jul 2012 13:41:49 -0700
Subject: [PATCH 072/118] Bug 774841 - Check the proper extension before using
 ImageTargetTexture2D - r=bgirard

---
 gfx/gl/GLContextProviderEGL.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index c7af240f3ed..dbc23cfbd3e 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -1571,7 +1571,9 @@ public:
         XSync(dpy, False);
         mConfig = nsnull;
 
-        if (sEGLLibrary.HasKHRImagePixmap() && sEGLLibrary.HasKHRImageTexture2D()) {
+        if (sEGLLibrary.HasKHRImagePixmap() &&
+            mGLContext->IsExtensionSupported(GLContext::OES_EGL_image))
+        {
             mEGLImage =
                 sEGLLibrary.fCreateImage(EGL_DISPLAY(),
                                          EGL_NO_CONTEXT,

From 5c5f0c538ce7471df2e8a02b75d937e51635490e Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Wed, 18 Jul 2012 14:02:04 -0700
Subject: [PATCH 073/118] Bug 767809 - BrowserToolbar.show/hide must be called
 on the UI thread [r=margaret]

---
 mobile/android/base/BrowserApp.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index f136b0fd74e..169730a0d6f 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -552,10 +552,14 @@ abstract public class BrowserApp extends GeckoApp
     @Override
     public void setFullScreen(final boolean fullscreen) {
       super.setFullScreen(fullscreen);
-      if (fullscreen)
-          mBrowserToolbar.hide();
-      else
-          mBrowserToolbar.show();
+      mMainHandler.post(new Runnable() {
+          public void run() {
+              if (fullscreen)
+                  mBrowserToolbar.hide();
+              else
+                  mBrowserToolbar.show();
+          }
+      });
     }
 
     @Override

From e748110311bf2e80cc0fab4886a0ee0a4a53167d Mon Sep 17 00:00:00 2001
From: Saurabh Anand <saurabhanandiit@gmail.com>
Date: Thu, 19 Jul 2012 02:23:40 +0530
Subject: [PATCH 074/118] Bug 722996 - cookieAcceptDialog.js uses global
 Private Browsing state to make decisions; r=ehsan

---
 toolkit/components/cookie/content/cookieAcceptDialog.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/toolkit/components/cookie/content/cookieAcceptDialog.js b/toolkit/components/cookie/content/cookieAcceptDialog.js
index 5bacc09fa80..525bef7773a 100644
--- a/toolkit/components/cookie/content/cookieAcceptDialog.js
+++ b/toolkit/components/cookie/content/cookieAcceptDialog.js
@@ -9,6 +9,8 @@ const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
 const nsICookie = Components.interfaces.nsICookie;
 const nsICookiePromptService = Components.interfaces.nsICookiePromptService;
 
+Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+
 var params; 
 var cookieBundle;
 var gDateService = null;
@@ -24,7 +26,7 @@ function onload()
   var dialog = document.documentElement;
 
   document.getElementById("Button2").collapsed = false;
-  
+
   document.getElementById("ok").label = dialog.getAttribute("acceptLabel");
   document.getElementById("ok").accessKey = dialog.getAttribute("acceptKey");
   document.getElementById("Button2").label = dialog.getAttribute("extra1Label");
@@ -67,7 +69,6 @@ function onload()
       params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
       var objects = params.objects;
       var cookie = params.objects.queryElementAt(0,nsICookie);
-      
       var cookiesFromHost = params.GetInt(nsICookieAcceptDialog.COOKIESFROMHOST);
 
       var messageFormat;
@@ -130,9 +131,7 @@ function onload()
 
   // The Private Browsing service might not be available
   try {
-    var pb = Components.classes["@mozilla.org/privatebrowsing;1"].
-             getService(Components.interfaces.nsIPrivateBrowsingService);
-    if (pb.privateBrowsingEnabled) {
+    if (window.opener && PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
       var persistCheckbox = document.getElementById("persistDomainAcceptance");
       persistCheckbox.removeAttribute("checked");
       persistCheckbox.setAttribute("disabled", "true");

From 3e4b30be5642f619181ebf33e18a0e14a6a963b1 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Wed, 18 Jul 2012 14:17:10 -0700
Subject: [PATCH 075/118] Bug 774059 - Fix up references to
 glEGLImageTargetTexture2D - r=bjacob

---
 gfx/gl/GLContext.cpp            |  5 +++--
 gfx/gl/GLContext.h              |  5 +++--
 gfx/gl/GLContextProviderEGL.cpp | 20 +++++++++-----------
 gfx/gl/GLContextSymbols.h       |  4 ++--
 gfx/gl/GLDefs.h                 | 11 +++++++++--
 gfx/gl/GLLibraryEGL.cpp         |  2 --
 gfx/gl/GLLibraryEGL.h           | 12 ------------
 7 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 8da20f072ee..08b086bae7d 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -79,6 +79,7 @@ static const char *sExtensionNames[] = {
     "GL_ARB_sync",
     "GL_OES_EGL_image",
     "GL_OES_EGL_sync",
+    "GL_OES_EGL_image_external",
     nsnull
 };
 
@@ -470,7 +471,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
 
         if (IsExtensionSupported(OES_EGL_image)) {
             SymLoadStruct imageSymbols[] = {
-                { (PRFuncPtr*) &mSymbols.fImageTargetTexture2D, { "EGLImageTargetTexture2DOES", nsnull } },
+                { (PRFuncPtr*) &mSymbols.fEGLImageTargetTexture2D, { "EGLImageTargetTexture2DOES", nsnull } },
                 { nsnull, { nsnull } },
             };
 
@@ -478,7 +479,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
                 NS_ERROR("GL supports OES_EGL_image without supplying its functions.");
 
                 MarkExtensionUnsupported(OES_EGL_image);
-                mSymbols.fImageTargetTexture2D = nsnull;
+                mSymbols.fEGLImageTargetTexture2D = nsnull;
             }
         }
        
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 0e96319e479..1098b60e5e3 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -1534,6 +1534,7 @@ public:
         ARB_sync,
         OES_EGL_image,
         OES_EGL_sync,
+        OES_EGL_image_external,
         Extensions_Max
     };
 
@@ -3082,10 +3083,10 @@ public:
      }
 
      // OES_EGL_image (GLES)
-     void fImageTargetTexture2D(GLenum target, GLeglImage image)
+     void fEGLImageTargetTexture2D(GLenum target, GLeglImage image)
      {
          BEFORE_GL_CALL;
-         mSymbols.fImageTargetTexture2D(target, image);
+         mSymbols.fEGLImageTargetTexture2D(target, image);
          AFTER_GL_CALL;
      }
 
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index dbc23cfbd3e..f26dab0a1e1 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -43,8 +43,6 @@
 using namespace android;
 
 # define EGL_NATIVE_BUFFER_ANDROID 0x3140
-# define EGL_IMAGE_PRESERVED_KHR   0x30D2
-# define GL_TEXTURE_EXTERNAL_OES   0x8D65
 
 # endif
 
@@ -408,15 +406,15 @@ public:
     {
 #if defined(MOZ_WIDGET_GONK)
         EGLint attrs[] = {
-            EGL_IMAGE_PRESERVED_KHR, LOCAL_EGL_TRUE,
+            LOCAL_EGL_IMAGE_PRESERVED, LOCAL_EGL_TRUE,
             LOCAL_EGL_NONE, LOCAL_EGL_NONE
         };
         EGLImage image = sEGLLibrary.fCreateImage(EGL_DISPLAY(),
                                                   EGL_NO_CONTEXT,
                                                   EGL_NATIVE_BUFFER_ANDROID,
                                                   buffer, attrs);
-        sEGLLibrary.fImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, image);
-        fBindTexture(GL_TEXTURE_EXTERNAL_OES, texture);
+        fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_EXTERNAL, image);
+        fBindTexture(LOCAL_GL_TEXTURE_EXTERNAL, texture);
         sEGLLibrary.fDestroyImage(EGL_DISPLAY(), image);
         return true;
 #else
@@ -865,7 +863,7 @@ bool GLContextEGL::AttachSharedHandle(TextureImage::TextureShareType aType,
 
     EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
     wrap->WaitSync();
-    sEGLLibrary.fImageTargetTexture2DOES(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
+    fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
     return true;
 }
 
@@ -1311,7 +1309,7 @@ public:
         if (UsingDirectTexture()) {
             mGLContext->fActiveTexture(aTextureUnit);
             mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-            sEGLLibrary.fImageTargetTexture2DOES(LOCAL_GL_TEXTURE_2D, mEGLImage);
+            fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, mEGLImage);
             if (sEGLLibrary.fGetError() != LOCAL_EGL_SUCCESS) {
                LOG("Could not set image target texture. ERROR (0x%04x)", sEGLLibrary.fGetError());
             }
@@ -1414,7 +1412,7 @@ public:
             mGLContext->MakeCurrent(true);
             mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
             mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-            sEGLLibrary.fImageTargetTexture2DOES(LOCAL_GL_TEXTURE_2D, 0);
+            mGLContext->fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, 0);
             if (sEGLLibrary.fGetError() != LOCAL_EGL_SUCCESS) {
                 LOG("Could not set image target texture. ERROR (0x%04x)", sEGLLibrary.fGetError());
                 return false;
@@ -1577,7 +1575,7 @@ public:
             mEGLImage =
                 sEGLLibrary.fCreateImage(EGL_DISPLAY(),
                                          EGL_NO_CONTEXT,
-                                         LOCAL_EGL_NATIVE_PIXMAP_KHR,
+                                         LOCAL_EGL_NATIVE_PIXMAP,
                                          (EGLClientBuffer)xsurface->XDrawable(),
                                          nsnull);
 
@@ -1586,7 +1584,7 @@ public:
                 return false;
             }
             mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-            mGLContext->fImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, mEGLImage);
+            mGLContext->fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, mEGLImage);
             sEGLLibrary.fDestroyImage(EGL_DISPLAY(), mEGLImage);
             mEGLImage = nsnull;
         } else {
@@ -1615,7 +1613,7 @@ public:
                              GraphicBuffer::USAGE_SW_WRITE_OFTEN;
             mGraphicBuffer = new GraphicBuffer(aSize.width, aSize.height, format, usage);
             if (mGraphicBuffer->initCheck() == OK) {
-                const int eglImageAttributes[] = { EGL_IMAGE_PRESERVED_KHR, LOCAL_EGL_TRUE,
+                const int eglImageAttributes[] = { LOCAL_EGL_IMAGE_PRESERVED, LOCAL_EGL_TRUE,
                                                    LOCAL_EGL_NONE, LOCAL_EGL_NONE };
                 mEGLImage = sEGLLibrary.fCreateImage(EGL_DISPLAY(),
                                                         EGL_NO_CONTEXT,
diff --git a/gfx/gl/GLContextSymbols.h b/gfx/gl/GLContextSymbols.h
index 3bab00e9aa5..73e7d29df02 100644
--- a/gfx/gl/GLContextSymbols.h
+++ b/gfx/gl/GLContextSymbols.h
@@ -373,8 +373,8 @@ struct GLContextSymbols
     PFNGLGETSYNCIV fGetSynciv;
 
     // OES_egl_image
-    typedef void (GLAPIENTRY * PFNGLIMAGETARGETTEXTURE2D)(GLenum target, GLeglImage image);
-    PFNGLIMAGETARGETTEXTURE2D fImageTargetTexture2D;
+    typedef void (GLAPIENTRY * PFNGLEGLIMAGETARGETTEXTURE2D)(GLenum target, GLeglImage image);
+    PFNGLEGLIMAGETARGETTEXTURE2D fEGLImageTargetTexture2D;
 };
 
 }
diff --git a/gfx/gl/GLDefs.h b/gfx/gl/GLDefs.h
index e5849944e84..01a0552fe37 100644
--- a/gfx/gl/GLDefs.h
+++ b/gfx/gl/GLDefs.h
@@ -3024,6 +3024,9 @@ typedef void* GLeglImage;
 #define LOCAL_GL_CONDITION_SATISFIED              0x911C
 #define LOCAL_GL_WAIT_FAILED                      0x911D
 
+// OES_EGL_image_external
+#define LOCAL_GL_TEXTURE_EXTERNAL                 0x8D65
+
 #define LOCAL_GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
 #define LOCAL_GL_MAX_VARYING_VECTORS              0x8DFC
 #define LOCAL_GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
@@ -3236,8 +3239,6 @@ typedef void* GLeglImage;
 #define LOCAL_EGL_TEXTURE_RGB                 0x305D
 #define LOCAL_EGL_TEXTURE_RGBA                0x305E
 #define LOCAL_EGL_TEXTURE_2D                  0x305F
-#define LOCAL_EGL_NATIVE_PIXMAP_KHR           0x30B0
-#define LOCAL_EGL_IMAGE_PRESERVED_KHR         0x30D2
 #define LOCAL_EGL_FALSE                       0
 #define LOCAL_EGL_TRUE                        1
 #define LOCAL_EGL_BITMAP_POINTER_KHR          0x30C6
@@ -3253,6 +3254,12 @@ typedef void* GLeglImage;
 #define LOCAL_EGL_DRAW                        0x3059
 #define LOCAL_EGL_CONTEXT_LOST                0x300E
 
+// EGL_KHR_image_base (not supplied by EGL_KHR_image!)
+#define LOCAL_EGL_IMAGE_PRESERVED             0x30D2
+
+// EGL_KHR_image_pixmap
+#define LOCAL_EGL_NATIVE_PIXMAP               0x30B0
+
 // EGL_KHR_gl_texture_2D_image
 #define LOCAL_EGL_GL_TEXTURE_2D               0x30B1
 
diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
index 8374f652d7b..b6c0cce5378 100644
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -309,7 +309,6 @@ GLLibraryEGL::LoadConfigSensitiveSymbols()
         GLLibraryLoader::SymLoadStruct imageSymbols[] = {
             { (PRFuncPtr*) &mSymbols.fCreateImage,  { "eglCreateImageKHR",  nsnull } },
             { (PRFuncPtr*) &mSymbols.fDestroyImage, { "eglDestroyImageKHR", nsnull } },
-            { (PRFuncPtr*) &mSymbols.fImageTargetTexture2DOES, { "glEGLImageTargetTexture2DOES", NULL } },
             { nsnull, { nsnull } }
         };
 
@@ -325,7 +324,6 @@ GLLibraryEGL::LoadConfigSensitiveSymbols()
 
             mSymbols.fCreateImage = nsnull;
             mSymbols.fDestroyImage = nsnull;
-            mSymbols.fImageTargetTexture2DOES = nsnull;
         }
     } else {
         MarkExtensionUnsupported(KHR_image_pixmap);
diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h
index 6ddb9659ba0..1bb4edd3437 100644
--- a/gfx/gl/GLLibraryEGL.h
+++ b/gfx/gl/GLLibraryEGL.h
@@ -421,13 +421,6 @@ public:
         return b;
     }
 
-    void fImageTargetTexture2DOES(GLenum target, EGLImage image)
-    {
-        BEFORE_GL_CALL;
-        mSymbols.fImageTargetTexture2DOES(target, image);
-        AFTER_GL_CALL;
-    }
-
 
     EGLDisplay Display() {
         return mEGLDisplay;
@@ -542,11 +535,6 @@ public:
         pfnClientWaitSync fClientWaitSync;
         typedef EGLBoolean (GLAPIENTRY * pfnGetSyncAttrib)(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLint *value);
         pfnGetSyncAttrib fGetSyncAttrib;
-
-        // This is EGL specific GL ext symbol "glEGLImageTargetTexture2DOES"
-        // Lets keep it here for now.
-        typedef void (GLAPIENTRY * pfnImageTargetTexture2DOES)(GLenum target, EGLImage image);
-        pfnImageTargetTexture2DOES fImageTargetTexture2DOES;
     } mSymbols;
 
 private:

From 0f84266c799da0606d0418361188c576c056f022 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Jul 2012 18:14:15 -0400
Subject: [PATCH 076/118] Bug 725702: support for of loops in Reflect.parse
 r=dherman

---
 js/src/jsast.tbl                              |  1 +
 js/src/jsreflect.cpp                          | 51 ++++++++++++++-----
 .../tests/js1_8_5/extensions/reflect-parse.js | 12 +++++
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/js/src/jsast.tbl b/js/src/jsast.tbl
index 344a1dd284d..556d2643db7 100644
--- a/js/src/jsast.tbl
+++ b/js/src/jsast.tbl
@@ -48,6 +48,7 @@ ASTDEF(AST_WHILE_STMT,            "WhileStatement",                 "whileStatem
 ASTDEF(AST_DO_STMT,               "DoWhileStatement",               "doWhileStatement")
 ASTDEF(AST_FOR_STMT,              "ForStatement",                   "forStatement")
 ASTDEF(AST_FOR_IN_STMT,           "ForInStatement",                 "forInStatement")
+ASTDEF(AST_FOR_OF_STMT,           "ForOfStatement",                 "forOfStatement")
 ASTDEF(AST_BREAK_STMT,            "BreakStatement",                 "breakStatement")
 ASTDEF(AST_CONTINUE_STMT,         "ContinueStatement",              "continueStatement")
 ASTDEF(AST_WITH_STMT,             "WithStatement",                  "withStatement")
diff --git a/js/src/jsreflect.cpp b/js/src/jsreflect.cpp
index 9619b94489b..3fdca45b92d 100644
--- a/js/src/jsreflect.cpp
+++ b/js/src/jsreflect.cpp
@@ -496,6 +496,9 @@ class NodeBuilder
     bool forInStatement(Value var, Value expr, Value stmt,
                         bool isForEach, TokenPos *pos, Value *dst);
 
+    bool forOfStatement(Value var, Value expr, Value stmt, TokenPos *pos, Value *dst);
+
+
     bool withStatement(Value expr, Value stmt, TokenPos *pos, Value *dst);
 
     bool whileStatement(Value test, Value stmt, TokenPos *pos, Value *dst);
@@ -839,6 +842,20 @@ NodeBuilder::forInStatement(Value var, Value expr, Value stmt, bool isForEach,
                    dst);
 }
 
+bool
+NodeBuilder::forOfStatement(Value var, Value expr, Value stmt, TokenPos *pos, Value *dst)
+{
+    Value cb = callbacks[AST_FOR_OF_STMT];
+    if (!cb.isNull())
+        return callback(cb, var, expr, stmt, pos, dst);
+
+    return newNode(AST_FOR_OF_STMT, pos,
+                   "left", var,
+                   "right", expr,
+                   "body", stmt,
+                   dst);
+}
+
 bool
 NodeBuilder::withStatement(Value expr, Value stmt, TokenPos *pos, Value *dst)
 {
@@ -1612,6 +1629,7 @@ class ASTSerializer
     }
 
     bool forInit(ParseNode *pn, Value *dst);
+    bool forOfOrIn(ParseNode *loop, ParseNode *head, Value var, Value stmt, Value *dst);
     bool statement(ParseNode *pn, Value *dst);
     bool blockStatement(ParseNode *pn, Value *dst);
     bool switchStatement(ParseNode *pn, Value *dst);
@@ -2072,6 +2090,19 @@ ASTSerializer::forInit(ParseNode *pn, Value *dst)
            : expression(pn, dst);
 }
 
+bool
+ASTSerializer::forOfOrIn(ParseNode *loop, ParseNode *head, Value var, Value stmt, Value *dst)
+{
+    Value expr;
+    bool isForEach = loop->pn_iflags & JSITER_FOREACH;
+    bool isForOf = loop->pn_iflags & JSITER_FOR_OF;
+    JS_ASSERT(!isForOf || !isForEach);
+
+    return expression(head->pn_kid3, &expr) &&
+        (isForOf ? builder.forOfStatement(var, expr, stmt, &loop->pn_pos, dst) :
+         builder.forInStatement(var, expr, stmt, isForEach, &loop->pn_pos, dst));
+}
+
 bool
 ASTSerializer::statement(ParseNode *pn, Value *dst)
 {
@@ -2153,18 +2184,14 @@ ASTSerializer::statement(ParseNode *pn, Value *dst)
         if (!statement(pn->pn_right, &stmt))
             return false;
 
-        bool isForEach = pn->pn_iflags & JSITER_FOREACH;
-
         if (head->isKind(PNK_FORIN)) {
-            Value var, expr;
-
+            Value var;
             return (!head->pn_kid1
                     ? pattern(head->pn_kid2, NULL, &var)
                     : head->pn_kid1->isKind(PNK_LEXICALSCOPE)
-                      ? variableDeclaration(head->pn_kid1->pn_expr, true, &var)
-                      : variableDeclaration(head->pn_kid1, false, &var)) &&
-                   expression(head->pn_kid3, &expr) &&
-                   builder.forInStatement(var, expr, stmt, isForEach, &pn->pn_pos, dst);
+                    ? variableDeclaration(head->pn_kid1->pn_expr, true, &var)
+                    : variableDeclaration(head->pn_kid1, false, &var)) &&
+                forOfOrIn(pn, head, var, stmt, dst);
         }
 
         Value init, test, update;
@@ -2192,13 +2219,9 @@ ASTSerializer::statement(ParseNode *pn, Value *dst)
         ParseNode *head = loop->pn_left;
         JS_ASSERT(head->isKind(PNK_FORIN));
 
-        bool isForEach = loop->pn_iflags & JSITER_FOREACH;
+        Value stmt;
 
-        Value expr, stmt;
-
-        return expression(head->pn_kid3, &expr) &&
-               statement(loop->pn_right, &stmt) &&
-               builder.forInStatement(var, expr, stmt, isForEach, &pn->pn_pos, dst);
+        return statement(loop->pn_right, &stmt) && forOfOrIn(loop, head, var, stmt, dst);
       }
 
       case PNK_BREAK:
diff --git a/js/src/tests/js1_8_5/extensions/reflect-parse.js b/js/src/tests/js1_8_5/extensions/reflect-parse.js
index 345f4d63a67..5e470761e03 100644
--- a/js/src/tests/js1_8_5/extensions/reflect-parse.js
+++ b/js/src/tests/js1_8_5/extensions/reflect-parse.js
@@ -47,6 +47,7 @@ function ident(name) Pattern({ type: "Identifier", name: name })
 function dotExpr(obj, id) Pattern({ type: "MemberExpression", computed: false, object: obj, property: id })
 function memExpr(obj, id) Pattern({ type: "MemberExpression", computed: true, object: obj, property: id })
 function forStmt(init, test, update, body) Pattern({ type: "ForStatement", init: init, test: test, update: update, body: body })
+function forOfStmt(lhs, rhs, body) Pattern({ type: "ForOfStatement", left: lhs, right: rhs, body: body })
 function forInStmt(lhs, rhs, body) Pattern({ type: "ForInStatement", left: lhs, right: rhs, body: body, each: false })
 function forEachInStmt(lhs, rhs, body) Pattern({ type: "ForInStatement", left: lhs, right: rhs, body: body, each: true })
 function breakStmt(lab) Pattern({ type: "BreakStatement", label: lab })
@@ -648,6 +649,12 @@ assertStmt("for ({a:x,b:y,c:z} in foo);", forInStmt(axbycz, ident("foo"), emptyS
 assertStmt("for (var [x,y,z] in foo);", forInStmt(varDecl([{ id: xyz, init: null }]), ident("foo"), emptyStmt));
 assertStmt("for (let [x,y,z] in foo);", forInStmt(letDecl([{ id: xyz, init: null }]), ident("foo"), emptyStmt));
 assertStmt("for ([x,y,z] in foo);", forInStmt(xyz, ident("foo"), emptyStmt));
+assertStmt("for (var {a:x,b:y,c:z} of foo);", forOfStmt(varDecl([{ id: axbycz, init: null }]), ident("foo"), emptyStmt));
+assertStmt("for (let {a:x,b:y,c:z} of foo);", forOfStmt(letDecl([{ id: axbycz, init: null }]), ident("foo"), emptyStmt));
+assertStmt("for ({a:x,b:y,c:z} of foo);", forOfStmt(axbycz, ident("foo"), emptyStmt));
+assertStmt("for (var [x,y,z] of foo);", forOfStmt(varDecl([{ id: xyz, init: null }]), ident("foo"), emptyStmt));
+assertStmt("for (let [x,y,z] of foo);", forOfStmt(letDecl([{ id: xyz, init: null }]), ident("foo"), emptyStmt));
+assertStmt("for ([x,y,z] of foo);", forOfStmt(xyz, ident("foo"), emptyStmt));
 assertStmt("for each (var {a:x,b:y,c:z} in foo);", forEachInStmt(varDecl([{ id: axbycz, init: null }]), ident("foo"), emptyStmt));
 assertStmt("for each (let {a:x,b:y,c:z} in foo);", forEachInStmt(letDecl([{ id: axbycz, init: null }]), ident("foo"), emptyStmt));
 assertStmt("for each ({a:x,b:y,c:z} in foo);", forEachInStmt(axbycz, ident("foo"), emptyStmt));
@@ -657,6 +664,9 @@ assertStmt("for each ([x,y,z] in foo);", forEachInStmt(xyz, ident("foo"), emptyS
 assertError("for (const x in foo);", SyntaxError);
 assertError("for (const {a:x,b:y,c:z} in foo);", SyntaxError);
 assertError("for (const [x,y,z] in foo);", SyntaxError);
+assertError("for (const x of foo);", SyntaxError);
+assertError("for (const {a:x,b:y,c:z} of foo);", SyntaxError);
+assertError("for (const [x,y,z] of foo);", SyntaxError);
 assertError("for each (const x in foo);", SyntaxError);
 assertError("for each (const {a:x,b:y,c:z} in foo);", SyntaxError);
 assertError("for each (const [x,y,z] in foo);", SyntaxError);
@@ -665,6 +675,8 @@ assertError("for each (const [x,y,z] in foo);", SyntaxError);
 
 assertStmt("for (var {a:x,b:y,c:z} = 22 in foo);", forInStmt(varDecl([{ id: axbycz, init: lit(22) }]), ident("foo"), emptyStmt));
 assertStmt("for (var [x,y,z] = 22 in foo);", forInStmt(varDecl([{ id: xyz, init: lit(22) }]), ident("foo"), emptyStmt));
+assertStmt("for (var {a:x,b:y,c:z} = 22 of foo);", forOfStmt(varDecl([{ id: axbycz, init: lit(22) }]), ident("foo"), emptyStmt));
+assertStmt("for (var [x,y,z] = 22 of foo);", forOfStmt(varDecl([{ id: xyz, init: lit(22) }]), ident("foo"), emptyStmt));
 assertStmt("for each (var {a:x,b:y,c:z} = 22 in foo);", forEachInStmt(varDecl([{ id: axbycz, init: lit(22) }]), ident("foo"), emptyStmt));
 assertStmt("for each (var [x,y,z] = 22 in foo);", forEachInStmt(varDecl([{ id: xyz, init: lit(22) }]), ident("foo"), emptyStmt));
 assertError("for (x = 22 in foo);", SyntaxError);

From 75a9b983bafc21e0ff4ce9034094686387d145c8 Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall@mozilla.com>
Date: Wed, 18 Jul 2012 15:16:31 -0700
Subject: [PATCH 077/118] Bug 775308 - Enable GPU acceleration in the emulator
 used by Marionette, r=jgriffin, DONTBUILD because NPOTB

---
 testing/marionette/client/marionette/emulator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/marionette/client/marionette/emulator.py b/testing/marionette/client/marionette/emulator.py
index ed034ff2b36..8bf9be2113b 100644
--- a/testing/marionette/client/marionette/emulator.py
+++ b/testing/marionette/client/marionette/emulator.py
@@ -133,6 +133,7 @@ class Emulator(object):
                          '-partition-size', '512',
                          '-verbose',
                          '-skin', self.res,
+                         '-gpu', 'on',
                          '-qemu'] + self.tail_args)
         return qemuArgs
 

From 35740f94a5d01c7feb816c8b82016e3208c9d17e Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Wed, 18 Jul 2012 15:23:47 -0700
Subject: [PATCH 078/118] Backed out changeset d4a04cc38326

---
 gfx/gl/GLContext.cpp            |  5 ++---
 gfx/gl/GLContext.h              |  5 ++---
 gfx/gl/GLContextProviderEGL.cpp | 20 +++++++++++---------
 gfx/gl/GLContextSymbols.h       |  4 ++--
 gfx/gl/GLDefs.h                 | 11 ++---------
 gfx/gl/GLLibraryEGL.cpp         |  2 ++
 gfx/gl/GLLibraryEGL.h           | 12 ++++++++++++
 7 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 08b086bae7d..8da20f072ee 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -79,7 +79,6 @@ static const char *sExtensionNames[] = {
     "GL_ARB_sync",
     "GL_OES_EGL_image",
     "GL_OES_EGL_sync",
-    "GL_OES_EGL_image_external",
     nsnull
 };
 
@@ -471,7 +470,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
 
         if (IsExtensionSupported(OES_EGL_image)) {
             SymLoadStruct imageSymbols[] = {
-                { (PRFuncPtr*) &mSymbols.fEGLImageTargetTexture2D, { "EGLImageTargetTexture2DOES", nsnull } },
+                { (PRFuncPtr*) &mSymbols.fImageTargetTexture2D, { "EGLImageTargetTexture2DOES", nsnull } },
                 { nsnull, { nsnull } },
             };
 
@@ -479,7 +478,7 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
                 NS_ERROR("GL supports OES_EGL_image without supplying its functions.");
 
                 MarkExtensionUnsupported(OES_EGL_image);
-                mSymbols.fEGLImageTargetTexture2D = nsnull;
+                mSymbols.fImageTargetTexture2D = nsnull;
             }
         }
        
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index 1098b60e5e3..0e96319e479 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -1534,7 +1534,6 @@ public:
         ARB_sync,
         OES_EGL_image,
         OES_EGL_sync,
-        OES_EGL_image_external,
         Extensions_Max
     };
 
@@ -3083,10 +3082,10 @@ public:
      }
 
      // OES_EGL_image (GLES)
-     void fEGLImageTargetTexture2D(GLenum target, GLeglImage image)
+     void fImageTargetTexture2D(GLenum target, GLeglImage image)
      {
          BEFORE_GL_CALL;
-         mSymbols.fEGLImageTargetTexture2D(target, image);
+         mSymbols.fImageTargetTexture2D(target, image);
          AFTER_GL_CALL;
      }
 
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index f26dab0a1e1..dbc23cfbd3e 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -43,6 +43,8 @@
 using namespace android;
 
 # define EGL_NATIVE_BUFFER_ANDROID 0x3140
+# define EGL_IMAGE_PRESERVED_KHR   0x30D2
+# define GL_TEXTURE_EXTERNAL_OES   0x8D65
 
 # endif
 
@@ -406,15 +408,15 @@ public:
     {
 #if defined(MOZ_WIDGET_GONK)
         EGLint attrs[] = {
-            LOCAL_EGL_IMAGE_PRESERVED, LOCAL_EGL_TRUE,
+            EGL_IMAGE_PRESERVED_KHR, LOCAL_EGL_TRUE,
             LOCAL_EGL_NONE, LOCAL_EGL_NONE
         };
         EGLImage image = sEGLLibrary.fCreateImage(EGL_DISPLAY(),
                                                   EGL_NO_CONTEXT,
                                                   EGL_NATIVE_BUFFER_ANDROID,
                                                   buffer, attrs);
-        fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_EXTERNAL, image);
-        fBindTexture(LOCAL_GL_TEXTURE_EXTERNAL, texture);
+        sEGLLibrary.fImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, image);
+        fBindTexture(GL_TEXTURE_EXTERNAL_OES, texture);
         sEGLLibrary.fDestroyImage(EGL_DISPLAY(), image);
         return true;
 #else
@@ -863,7 +865,7 @@ bool GLContextEGL::AttachSharedHandle(TextureImage::TextureShareType aType,
 
     EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
     wrap->WaitSync();
-    fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
+    sEGLLibrary.fImageTargetTexture2DOES(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
     return true;
 }
 
@@ -1309,7 +1311,7 @@ public:
         if (UsingDirectTexture()) {
             mGLContext->fActiveTexture(aTextureUnit);
             mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-            fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, mEGLImage);
+            sEGLLibrary.fImageTargetTexture2DOES(LOCAL_GL_TEXTURE_2D, mEGLImage);
             if (sEGLLibrary.fGetError() != LOCAL_EGL_SUCCESS) {
                LOG("Could not set image target texture. ERROR (0x%04x)", sEGLLibrary.fGetError());
             }
@@ -1412,7 +1414,7 @@ public:
             mGLContext->MakeCurrent(true);
             mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
             mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-            mGLContext->fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, 0);
+            sEGLLibrary.fImageTargetTexture2DOES(LOCAL_GL_TEXTURE_2D, 0);
             if (sEGLLibrary.fGetError() != LOCAL_EGL_SUCCESS) {
                 LOG("Could not set image target texture. ERROR (0x%04x)", sEGLLibrary.fGetError());
                 return false;
@@ -1575,7 +1577,7 @@ public:
             mEGLImage =
                 sEGLLibrary.fCreateImage(EGL_DISPLAY(),
                                          EGL_NO_CONTEXT,
-                                         LOCAL_EGL_NATIVE_PIXMAP,
+                                         LOCAL_EGL_NATIVE_PIXMAP_KHR,
                                          (EGLClientBuffer)xsurface->XDrawable(),
                                          nsnull);
 
@@ -1584,7 +1586,7 @@ public:
                 return false;
             }
             mGLContext->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexture);
-            mGLContext->fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, mEGLImage);
+            mGLContext->fImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, mEGLImage);
             sEGLLibrary.fDestroyImage(EGL_DISPLAY(), mEGLImage);
             mEGLImage = nsnull;
         } else {
@@ -1613,7 +1615,7 @@ public:
                              GraphicBuffer::USAGE_SW_WRITE_OFTEN;
             mGraphicBuffer = new GraphicBuffer(aSize.width, aSize.height, format, usage);
             if (mGraphicBuffer->initCheck() == OK) {
-                const int eglImageAttributes[] = { LOCAL_EGL_IMAGE_PRESERVED, LOCAL_EGL_TRUE,
+                const int eglImageAttributes[] = { EGL_IMAGE_PRESERVED_KHR, LOCAL_EGL_TRUE,
                                                    LOCAL_EGL_NONE, LOCAL_EGL_NONE };
                 mEGLImage = sEGLLibrary.fCreateImage(EGL_DISPLAY(),
                                                         EGL_NO_CONTEXT,
diff --git a/gfx/gl/GLContextSymbols.h b/gfx/gl/GLContextSymbols.h
index 73e7d29df02..3bab00e9aa5 100644
--- a/gfx/gl/GLContextSymbols.h
+++ b/gfx/gl/GLContextSymbols.h
@@ -373,8 +373,8 @@ struct GLContextSymbols
     PFNGLGETSYNCIV fGetSynciv;
 
     // OES_egl_image
-    typedef void (GLAPIENTRY * PFNGLEGLIMAGETARGETTEXTURE2D)(GLenum target, GLeglImage image);
-    PFNGLEGLIMAGETARGETTEXTURE2D fEGLImageTargetTexture2D;
+    typedef void (GLAPIENTRY * PFNGLIMAGETARGETTEXTURE2D)(GLenum target, GLeglImage image);
+    PFNGLIMAGETARGETTEXTURE2D fImageTargetTexture2D;
 };
 
 }
diff --git a/gfx/gl/GLDefs.h b/gfx/gl/GLDefs.h
index 01a0552fe37..e5849944e84 100644
--- a/gfx/gl/GLDefs.h
+++ b/gfx/gl/GLDefs.h
@@ -3024,9 +3024,6 @@ typedef void* GLeglImage;
 #define LOCAL_GL_CONDITION_SATISFIED              0x911C
 #define LOCAL_GL_WAIT_FAILED                      0x911D
 
-// OES_EGL_image_external
-#define LOCAL_GL_TEXTURE_EXTERNAL                 0x8D65
-
 #define LOCAL_GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
 #define LOCAL_GL_MAX_VARYING_VECTORS              0x8DFC
 #define LOCAL_GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
@@ -3239,6 +3236,8 @@ typedef void* GLeglImage;
 #define LOCAL_EGL_TEXTURE_RGB                 0x305D
 #define LOCAL_EGL_TEXTURE_RGBA                0x305E
 #define LOCAL_EGL_TEXTURE_2D                  0x305F
+#define LOCAL_EGL_NATIVE_PIXMAP_KHR           0x30B0
+#define LOCAL_EGL_IMAGE_PRESERVED_KHR         0x30D2
 #define LOCAL_EGL_FALSE                       0
 #define LOCAL_EGL_TRUE                        1
 #define LOCAL_EGL_BITMAP_POINTER_KHR          0x30C6
@@ -3254,12 +3253,6 @@ typedef void* GLeglImage;
 #define LOCAL_EGL_DRAW                        0x3059
 #define LOCAL_EGL_CONTEXT_LOST                0x300E
 
-// EGL_KHR_image_base (not supplied by EGL_KHR_image!)
-#define LOCAL_EGL_IMAGE_PRESERVED             0x30D2
-
-// EGL_KHR_image_pixmap
-#define LOCAL_EGL_NATIVE_PIXMAP               0x30B0
-
 // EGL_KHR_gl_texture_2D_image
 #define LOCAL_EGL_GL_TEXTURE_2D               0x30B1
 
diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
index b6c0cce5378..8374f652d7b 100644
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -309,6 +309,7 @@ GLLibraryEGL::LoadConfigSensitiveSymbols()
         GLLibraryLoader::SymLoadStruct imageSymbols[] = {
             { (PRFuncPtr*) &mSymbols.fCreateImage,  { "eglCreateImageKHR",  nsnull } },
             { (PRFuncPtr*) &mSymbols.fDestroyImage, { "eglDestroyImageKHR", nsnull } },
+            { (PRFuncPtr*) &mSymbols.fImageTargetTexture2DOES, { "glEGLImageTargetTexture2DOES", NULL } },
             { nsnull, { nsnull } }
         };
 
@@ -324,6 +325,7 @@ GLLibraryEGL::LoadConfigSensitiveSymbols()
 
             mSymbols.fCreateImage = nsnull;
             mSymbols.fDestroyImage = nsnull;
+            mSymbols.fImageTargetTexture2DOES = nsnull;
         }
     } else {
         MarkExtensionUnsupported(KHR_image_pixmap);
diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h
index 1bb4edd3437..6ddb9659ba0 100644
--- a/gfx/gl/GLLibraryEGL.h
+++ b/gfx/gl/GLLibraryEGL.h
@@ -421,6 +421,13 @@ public:
         return b;
     }
 
+    void fImageTargetTexture2DOES(GLenum target, EGLImage image)
+    {
+        BEFORE_GL_CALL;
+        mSymbols.fImageTargetTexture2DOES(target, image);
+        AFTER_GL_CALL;
+    }
+
 
     EGLDisplay Display() {
         return mEGLDisplay;
@@ -535,6 +542,11 @@ public:
         pfnClientWaitSync fClientWaitSync;
         typedef EGLBoolean (GLAPIENTRY * pfnGetSyncAttrib)(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLint *value);
         pfnGetSyncAttrib fGetSyncAttrib;
+
+        // This is EGL specific GL ext symbol "glEGLImageTargetTexture2DOES"
+        // Lets keep it here for now.
+        typedef void (GLAPIENTRY * pfnImageTargetTexture2DOES)(GLenum target, EGLImage image);
+        pfnImageTargetTexture2DOES fImageTargetTexture2DOES;
     } mSymbols;
 
 private:

From 1b7789c2694fa26d9fbdb8f6c4678c8ad2c949f5 Mon Sep 17 00:00:00 2001
From: David Clarke <dclarke@mozilla.com>
Date: Wed, 18 Jul 2012 15:38:00 -0700
Subject: [PATCH 079/118] Bug 775051 - Make sure there is a valid url before
 attempting to add perms for it, r=philikon

---
 b2g/chrome/content/shell.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 1a51fdfd504..6e4f14f8b9b 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -58,14 +58,17 @@ function addPermissions(urls) {
     'content-camera', 'webcontacts-manage', 'wifi-manage', 'desktop-notification',
     'geolocation', 'device-storage', 'alarms'
   ];
+
   urls.forEach(function(url) {
     url = url.trim();
-    let uri = Services.io.newURI(url, null, null);
-    let allow = Ci.nsIPermissionManager.ALLOW_ACTION;
+    if (url) {
+      let uri = Services.io.newURI(url, null, null);
+      let allow = Ci.nsIPermissionManager.ALLOW_ACTION;
 
-    permissions.forEach(function(permission) {
-      Services.perms.add(uri, permission, allow);
-    });
+      permissions.forEach(function(permission) {
+        Services.perms.add(uri, permission, allow);
+      });
+    }
   });
 }
 

From a3df4ac39e5358966815417a726f39d22e7b9b90 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <amccreight@mozilla.com>
Date: Wed, 18 Jul 2012 15:44:22 -0700
Subject: [PATCH 080/118] Bug 770218 - null check mAList during unlink of
 DOMSVG{Length,Number,Transform}List. r=jwatt

---
 content/svg/content/src/DOMSVGLengthList.cpp    | 11 ++++++++---
 content/svg/content/src/DOMSVGNumberList.cpp    | 11 ++++++++---
 content/svg/content/src/DOMSVGTransformList.cpp | 12 ++++++++----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/content/svg/content/src/DOMSVGLengthList.cpp b/content/svg/content/src/DOMSVGLengthList.cpp
index d8972bb2403..bcdd661c9c1 100644
--- a/content/svg/content/src/DOMSVGLengthList.cpp
+++ b/content/svg/content/src/DOMSVGLengthList.cpp
@@ -41,9 +41,14 @@ namespace mozilla {
 // the cycle, as NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)
 NS_IMPL_CYCLE_COLLECTION_CLASS(DOMSVGLengthList)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(DOMSVGLengthList)
-  // No need to null check tmp - script/SMIL can't detach us from mAList
-  ( tmp->IsAnimValList() ? tmp->mAList->mAnimVal : tmp->mAList->mBaseVal ) = nsnull;
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAList)
+  if (tmp->mAList) {
+    if (tmp->IsAnimValList()) {
+      tmp->mAList->mAnimVal = nsnull;
+    } else {
+      tmp->mAList->mBaseVal = nsnull;
+    }
+    NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAList)
+  }
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(DOMSVGLengthList)
diff --git a/content/svg/content/src/DOMSVGNumberList.cpp b/content/svg/content/src/DOMSVGNumberList.cpp
index 8577513f8e4..fe94498ecf9 100644
--- a/content/svg/content/src/DOMSVGNumberList.cpp
+++ b/content/svg/content/src/DOMSVGNumberList.cpp
@@ -41,9 +41,14 @@ void UpdateListIndicesFromIndex(nsTArray<DOMSVGNumber*>& aItemsArray,
 // the cycle, as NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)
 NS_IMPL_CYCLE_COLLECTION_CLASS(DOMSVGNumberList)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(DOMSVGNumberList)
-  // No need to null check tmp - script/SMIL can't detach us from mAList
-  ( tmp->IsAnimValList() ? tmp->mAList->mAnimVal : tmp->mAList->mBaseVal ) = nsnull;
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAList)
+  if (tmp->mAList) {
+    if (tmp->IsAnimValList()) {
+      tmp->mAList->mAnimVal = nsnull;
+    } else {
+      tmp->mAList->mBaseVal = nsnull;
+    }
+    NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAList)
+  }
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(DOMSVGNumberList)
diff --git a/content/svg/content/src/DOMSVGTransformList.cpp b/content/svg/content/src/DOMSVGTransformList.cpp
index 96132d54a5c..30255dcee39 100644
--- a/content/svg/content/src/DOMSVGTransformList.cpp
+++ b/content/svg/content/src/DOMSVGTransformList.cpp
@@ -37,10 +37,14 @@ namespace mozilla {
 // the cycle, as NS_SVG_VAL_IMPL_CYCLE_COLLECTION does.)
 NS_IMPL_CYCLE_COLLECTION_CLASS(DOMSVGTransformList)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(DOMSVGTransformList)
-  // No need to null check tmp - script/SMIL can't detach us from mAList
-  ( tmp->IsAnimValList() ? tmp->mAList->mAnimVal : tmp->mAList->mBaseVal ) =
-    nsnull;
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAList)
+  if (tmp->mAList) {
+    if (tmp->IsAnimValList()) {
+      tmp->mAList->mAnimVal = nsnull;
+    } else {
+      tmp->mAList->mBaseVal = nsnull;
+    }
+    NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAList)
+  }
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(DOMSVGTransformList)

From fb11286c1590367fa2bc75db4dc2dbdbf11b459b Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 18 Jul 2012 15:43:34 -0700
Subject: [PATCH 081/118] comparing with
 http://hg.mozilla.org/integration/mozilla-inbound/ searching for changes
 changeset:   99712:bbdfd47ad4d7 tag:         tip user:        Wes Johnston
 <wjohnston@mozilla.com> summary:     Bug 766802 - Clicks on links with
 target=blank in webapps should open in the browser. r=mfinkle

---
 mobile/android/chrome/content/WebAppRT.js | 39 +++++++++++++++++++++++
 mobile/android/chrome/content/browser.js  |  4 +++
 mobile/android/chrome/jar.mn              |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 mobile/android/chrome/content/WebAppRT.js

diff --git a/mobile/android/chrome/content/WebAppRT.js b/mobile/android/chrome/content/WebAppRT.js
new file mode 100644
index 00000000000..6e4417e8bc1
--- /dev/null
+++ b/mobile/android/chrome/content/WebAppRT.js
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+let Cc = Components.classes;
+let Ci = Components.interfaces;
+let Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+var WebAppRT = {
+  init: function() {
+    this.deck = document.getElementById("browsers");
+    this.deck.addEventListener("click", onContentClick, false, true);
+  },
+
+  handleEvent: function(event) {
+    let target = event.target;
+  
+    if (!(target instanceof HTMLAnchorElement) ||
+        target.getAttribute("target") != "_blank") {
+      return;
+    }
+  
+    let uri = Services.io.newURI(target.href,
+                                 target.ownerDocument.characterSet,
+                                 null);
+  
+    // Direct the URL to the browser.
+    Cc["@mozilla.org/uriloader/external-protocol-service;1"].
+      getService(Ci.nsIExternalProtocolService).
+      getProtocolHandlerInfo(uri.scheme).
+      launchWithURI(uri);
+  
+    // Prevent the runtime from loading the URL.  We do this after directing it
+    // to the browser to give the runtime a shot at handling the URL if we fail
+    // to direct it to the browser for some reason.
+    event.preventDefault();
+  }
+}
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 29a248cce06..cff50c593d6 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -32,6 +32,7 @@ XPCOMUtils.defineLazyGetter(this, "DebuggerServer", function() {
   ["HelperApps", "chrome://browser/content/HelperApps.js"],
   ["SelectHelper", "chrome://browser/content/SelectHelper.js"],
   ["Readability", "chrome://browser/content/Readability.js"],
+  ["WebAppRT", "chrome://browser/content/WebAppRT.js"],
 ].forEach(function (aScript) {
   let [name, script] = aScript;
   XPCOMUtils.defineLazyGetter(window, name, function() {
@@ -309,6 +310,9 @@ var BrowserApp = {
 #endif
     }
 
+    if (pinned)
+      WebAppRT.init();
+
     if (this.isAppUpdated())
       this.onAppUpdated();
 
diff --git a/mobile/android/chrome/jar.mn b/mobile/android/chrome/jar.mn
index 39c7d2e03da..efc847482d7 100644
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -36,6 +36,7 @@ chrome.jar:
   content/SelectHelper.js              (content/SelectHelper.js)
   content/HelperApps.js                (content/HelperApps.js)
   content/dbg-browser-actors.js        (content/dbg-browser-actors.js)
+  content/WebAppRT.js                  (content/WebAppRT.js)
 
 % content branding %content/branding/
 

From 3607438e7502467febfc4be3e1b4dd951043fb28 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 18 Jul 2012 15:53:17 -0700
Subject: [PATCH 082/118] Bug 771378 (part 4) - Follow-up to avoid an
 uninitialized variable.  r=sfink.

--HG--
extra : rebase_source : 44f1456136324ae76f27077829faf546024bad11
---
 js/src/jsxml.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index 7b38a26212e..d8a7a09d156 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -5194,7 +5194,7 @@ js_TestXMLEquality(JSContext *cx, const Value &v1, const Value &v2, JSBool *bp)
 {
     JSXML *xml, *vxml;
     JSObject *vobj;
-    JSBool ok;
+    JSBool ok = JS_TRUE;
     JSString *str, *vstr;
     double d, d2;
 

From 7282ef52602cfd96ebb83527c40fe65cc24c7fdd Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 18 Jul 2012 16:02:55 -0700
Subject: [PATCH 083/118] backout 2c49724bcbfd

---
 mobile/android/chrome/content/WebAppRT.js | 39 -----------------------
 mobile/android/chrome/content/browser.js  |  4 ---
 mobile/android/chrome/jar.mn              |  1 -
 3 files changed, 44 deletions(-)
 delete mode 100644 mobile/android/chrome/content/WebAppRT.js

diff --git a/mobile/android/chrome/content/WebAppRT.js b/mobile/android/chrome/content/WebAppRT.js
deleted file mode 100644
index 6e4417e8bc1..00000000000
--- a/mobile/android/chrome/content/WebAppRT.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-
-Cu.import("resource://gre/modules/Services.jsm");
-
-var WebAppRT = {
-  init: function() {
-    this.deck = document.getElementById("browsers");
-    this.deck.addEventListener("click", onContentClick, false, true);
-  },
-
-  handleEvent: function(event) {
-    let target = event.target;
-  
-    if (!(target instanceof HTMLAnchorElement) ||
-        target.getAttribute("target") != "_blank") {
-      return;
-    }
-  
-    let uri = Services.io.newURI(target.href,
-                                 target.ownerDocument.characterSet,
-                                 null);
-  
-    // Direct the URL to the browser.
-    Cc["@mozilla.org/uriloader/external-protocol-service;1"].
-      getService(Ci.nsIExternalProtocolService).
-      getProtocolHandlerInfo(uri.scheme).
-      launchWithURI(uri);
-  
-    // Prevent the runtime from loading the URL.  We do this after directing it
-    // to the browser to give the runtime a shot at handling the URL if we fail
-    // to direct it to the browser for some reason.
-    event.preventDefault();
-  }
-}
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index cff50c593d6..29a248cce06 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -32,7 +32,6 @@ XPCOMUtils.defineLazyGetter(this, "DebuggerServer", function() {
   ["HelperApps", "chrome://browser/content/HelperApps.js"],
   ["SelectHelper", "chrome://browser/content/SelectHelper.js"],
   ["Readability", "chrome://browser/content/Readability.js"],
-  ["WebAppRT", "chrome://browser/content/WebAppRT.js"],
 ].forEach(function (aScript) {
   let [name, script] = aScript;
   XPCOMUtils.defineLazyGetter(window, name, function() {
@@ -310,9 +309,6 @@ var BrowserApp = {
 #endif
     }
 
-    if (pinned)
-      WebAppRT.init();
-
     if (this.isAppUpdated())
       this.onAppUpdated();
 
diff --git a/mobile/android/chrome/jar.mn b/mobile/android/chrome/jar.mn
index efc847482d7..39c7d2e03da 100644
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -36,7 +36,6 @@ chrome.jar:
   content/SelectHelper.js              (content/SelectHelper.js)
   content/HelperApps.js                (content/HelperApps.js)
   content/dbg-browser-actors.js        (content/dbg-browser-actors.js)
-  content/WebAppRT.js                  (content/WebAppRT.js)
 
 % content branding %content/branding/
 

From 58b19580ad77f8f9c0bed2f353448f474b3a5bfa Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 18 Jul 2012 15:43:34 -0700
Subject: [PATCH 084/118] Bug 766802 - Target=blank links should open in the
 browser for webapps. r=mfinkle DONTBUILD

---
 mobile/android/chrome/content/WebAppRT.js | 39 +++++++++++++++++++++++
 mobile/android/chrome/content/browser.js  |  4 +++
 mobile/android/chrome/jar.mn              |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 mobile/android/chrome/content/WebAppRT.js

diff --git a/mobile/android/chrome/content/WebAppRT.js b/mobile/android/chrome/content/WebAppRT.js
new file mode 100644
index 00000000000..6e4417e8bc1
--- /dev/null
+++ b/mobile/android/chrome/content/WebAppRT.js
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+let Cc = Components.classes;
+let Ci = Components.interfaces;
+let Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+var WebAppRT = {
+  init: function() {
+    this.deck = document.getElementById("browsers");
+    this.deck.addEventListener("click", onContentClick, false, true);
+  },
+
+  handleEvent: function(event) {
+    let target = event.target;
+  
+    if (!(target instanceof HTMLAnchorElement) ||
+        target.getAttribute("target") != "_blank") {
+      return;
+    }
+  
+    let uri = Services.io.newURI(target.href,
+                                 target.ownerDocument.characterSet,
+                                 null);
+  
+    // Direct the URL to the browser.
+    Cc["@mozilla.org/uriloader/external-protocol-service;1"].
+      getService(Ci.nsIExternalProtocolService).
+      getProtocolHandlerInfo(uri.scheme).
+      launchWithURI(uri);
+  
+    // Prevent the runtime from loading the URL.  We do this after directing it
+    // to the browser to give the runtime a shot at handling the URL if we fail
+    // to direct it to the browser for some reason.
+    event.preventDefault();
+  }
+}
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 29a248cce06..cff50c593d6 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -32,6 +32,7 @@ XPCOMUtils.defineLazyGetter(this, "DebuggerServer", function() {
   ["HelperApps", "chrome://browser/content/HelperApps.js"],
   ["SelectHelper", "chrome://browser/content/SelectHelper.js"],
   ["Readability", "chrome://browser/content/Readability.js"],
+  ["WebAppRT", "chrome://browser/content/WebAppRT.js"],
 ].forEach(function (aScript) {
   let [name, script] = aScript;
   XPCOMUtils.defineLazyGetter(window, name, function() {
@@ -309,6 +310,9 @@ var BrowserApp = {
 #endif
     }
 
+    if (pinned)
+      WebAppRT.init();
+
     if (this.isAppUpdated())
       this.onAppUpdated();
 
diff --git a/mobile/android/chrome/jar.mn b/mobile/android/chrome/jar.mn
index 39c7d2e03da..efc847482d7 100644
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -36,6 +36,7 @@ chrome.jar:
   content/SelectHelper.js              (content/SelectHelper.js)
   content/HelperApps.js                (content/HelperApps.js)
   content/dbg-browser-actors.js        (content/dbg-browser-actors.js)
+  content/WebAppRT.js                  (content/WebAppRT.js)
 
 % content branding %content/branding/
 

From 71c6312f0ba94d39a3e92245ad1b02f439bc18b4 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Wed, 18 Jul 2012 16:18:42 -0700
Subject: [PATCH 085/118] Back out 44f8cae1dcf0, part of bug 769594, due to
 orange

---
 content/base/src/nsObjectLoadingContent.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index bd9b423f3a1..0e9ab52566c 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -496,24 +496,19 @@ nsresult nsObjectLoadingContent::IsPluginEnabledForType(const nsCString& aMIMETy
     rv = topWindow->GetDocument(getter_AddRefs(topDocument));
     NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIDocument> topDoc = do_QueryInterface(topDocument);
+    nsIURI* topUri = topDoc->GetDocumentURI();
 
     nsCOMPtr<nsIPermissionManager> permissionManager = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
-    bool allowPerm = false;
-    if (!nsContentUtils::IsSystemPrincipal(topDoc->NodePrincipal())) {
-      PRUint32 permission;
-      rv = permissionManager->TestPermissionFromPrincipal(topDoc->NodePrincipal(),
-                                                          "plugins",
-                                                          &permission);
-      NS_ENSURE_SUCCESS(rv, rv);
-      allowPerm = permission == nsIPermissionManager::ALLOW_ACTION;
-    }
+    PRUint32 permission;
+    rv = permissionManager->TestPermission(topUri, "plugins", &permission);
+    NS_ENSURE_SUCCESS(rv, rv);
 
     PRUint32 state;
     rv = pluginHost->GetBlocklistStateForType(aMIMEType.get(), &state);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    if (allowPerm &&
+    if (permission == nsIPermissionManager::ALLOW_ACTION &&
         state != nsIBlocklistService::STATE_VULNERABLE_UPDATE_AVAILABLE &&
         state != nsIBlocklistService::STATE_VULNERABLE_NO_UPDATE) {
       mCTPPlayable = true;

From cb9faf6363d12b38f422f9ce16322b6b1e30c4d5 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Wed, 18 Jul 2012 17:16:58 -0700
Subject: [PATCH 086/118] Bug 773934 followup: add license headers to new
 files, and remove unused code

--HG--
extra : transplant_source : %91%7C%F2r%1B%A9%94%A1Q%85%5E%F7N76%83%9C%F80%D7
---
 toolkit/components/social/FrameWorker.jsm      | 4 ----
 toolkit/components/social/MessagePortBase.jsm  | 4 ++++
 toolkit/components/social/MessagePortWorker.js | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/social/FrameWorker.jsm b/toolkit/components/social/FrameWorker.jsm
index ec0885e2f9e..bd812e66498 100644
--- a/toolkit/components/social/FrameWorker.jsm
+++ b/toolkit/components/social/FrameWorker.jsm
@@ -159,10 +159,6 @@ FrameWorker.prototype = {
       workerWindow.removeEventListener("load", loadListener);
       // the iframe has loaded the js file as text - first inject the magic
       // port-handling code into the sandbox.
-      function getProtoSource(ob) {
-        let raw = ob.prototype.toSource();
-        return ob.name + ".prototype=" + raw + ";"
-      }
       try {
         Services.scriptloader.loadSubScript("resource://gre/modules/MessagePortBase.jsm", sandbox);
         Services.scriptloader.loadSubScript("resource://gre/modules/MessagePortWorker.js", sandbox);
diff --git a/toolkit/components/social/MessagePortBase.jsm b/toolkit/components/social/MessagePortBase.jsm
index e7684225b1f..0201e340f89 100644
--- a/toolkit/components/social/MessagePortBase.jsm
+++ b/toolkit/components/social/MessagePortBase.jsm
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 // Code that is shared between clients and workers.
 const EXPORTED_SYMBOLS = ["AbstractPort"];
 
diff --git a/toolkit/components/social/MessagePortWorker.js b/toolkit/components/social/MessagePortWorker.js
index b77ce90be0d..d06769cd13e 100644
--- a/toolkit/components/social/MessagePortWorker.js
+++ b/toolkit/components/social/MessagePortWorker.js
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 // Note: this is never instantiated in chrome - the source is sent across
 // to the worker and it is evaluated there and created in response to a
 // port-create message we send.

From 225ceac5b8506d71a8952a0a21efd8d9475076b1 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 18 Jul 2012 17:56:44 -0700
Subject: [PATCH 087/118] Bug 766802 - Follow up to fix event listener.
 r=mfinkle

---
 mobile/android/chrome/content/WebAppRT.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/chrome/content/WebAppRT.js b/mobile/android/chrome/content/WebAppRT.js
index 6e4417e8bc1..6a61c15941a 100644
--- a/mobile/android/chrome/content/WebAppRT.js
+++ b/mobile/android/chrome/content/WebAppRT.js
@@ -10,7 +10,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 var WebAppRT = {
   init: function() {
     this.deck = document.getElementById("browsers");
-    this.deck.addEventListener("click", onContentClick, false, true);
+    this.deck.addEventListener("click", this, false, true);
   },
 
   handleEvent: function(event) {

From cde76456351de2516509877ee5e3bcb51ab26137 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 18 Jul 2012 17:58:56 -0700
Subject: [PATCH 088/118] Bug 703279 - Cancel panning when a context menu is
 shown. r=kats

---
 mobile/android/base/PromptService.java        | 8 ++++++++
 mobile/android/base/ui/PanZoomController.java | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/mobile/android/base/PromptService.java b/mobile/android/base/PromptService.java
index bd75fd0061e..1bcc8503c32 100644
--- a/mobile/android/base/PromptService.java
+++ b/mobile/android/base/PromptService.java
@@ -196,6 +196,14 @@ public class PromptService implements OnClickListener, OnCancelListener, OnItemC
     }
 
     public void show(String aTitle, String aText, PromptButton[] aButtons, PromptListItem[] aMenuList, boolean aMultipleSelection) {
+        final LayerController controller = GeckoApp.mAppContext.getLayerController();
+        controller.post(new Runnable() {
+            public void run() {
+                // treat actions that show a dialog as if preventDefault by content to prevent panning
+                controller.getPanZoomController().abortPanning();
+            }
+        });
+
         AlertDialog.Builder builder = new AlertDialog.Builder(GeckoApp.mAppContext);
         if (!aTitle.equals("")) {
             builder.setTitle(aTitle);
diff --git a/mobile/android/base/ui/PanZoomController.java b/mobile/android/base/ui/PanZoomController.java
index b2dc308bc10..3fc5f93bf3c 100644
--- a/mobile/android/base/ui/PanZoomController.java
+++ b/mobile/android/base/ui/PanZoomController.java
@@ -1066,4 +1066,11 @@ public class PanZoomController
         bounce(finalMetrics);
         return true;
     }
+
+    /** This function must be called from the UI thread. */
+    public void abortPanning() {
+        checkMainThread();
+        mState = PanZoomState.NOTHING;
+        bounce();
+    }
 }

From d7c9e2fe982551ca9fbf637e3394a7d49fded6dc Mon Sep 17 00:00:00 2001
From: "ku.b@gmx.de" <ku.b@gmx.de>
Date: Wed, 18 Jul 2012 21:09:13 -0400
Subject: [PATCH 089/118] Bug 709732 - double color correction with X Color
 Management

---
 gfx/thebes/gfxPlatformGtk.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index 8276595ccd6..0d4d95ed5f0 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -500,16 +500,10 @@ gfxPlatformGtk::GetPlatformCMSOutputProfile()
     if (iccAtom) {
         // read once to get size, once for the data
         if (Success == XGetWindowProperty(dpy, root, iccAtom,
-                                          0, 0 /* length */,
+                                          0, INT_MAX /* length */,
                                           False, AnyPropertyType,
                                           &retAtom, &retFormat, &retLength,
                                           &retAfter, &retProperty)) {
-            XGetWindowProperty(dpy, root, iccAtom,
-                               0, retLength,
-                               False, AnyPropertyType,
-                               &retAtom, &retFormat, &retLength,
-                               &retAfter, &retProperty);
-
             qcms_profile* profile = NULL;
 
             if (retLength > 0)

From 20f50ad90fd18f1dd7dbb95c861a00dc3e6f782a Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Wed, 18 Jul 2012 21:09:14 -0400
Subject: [PATCH 090/118] Bug 769310 - Windows paths. r=taras

---
 toolkit/components/osfile/Makefile.in         |   1 +
 toolkit/components/osfile/osfile_win_back.jsm | 248 -----------------
 .../components/osfile/osfile_win_front.jsm    |   1 +
 toolkit/components/osfile/ospath_win_back.jsm | 259 ++++++++++++++++++
 4 files changed, 261 insertions(+), 248 deletions(-)
 create mode 100644 toolkit/components/osfile/ospath_win_back.jsm

diff --git a/toolkit/components/osfile/Makefile.in b/toolkit/components/osfile/Makefile.in
index 2d82c0cec67..b9484fce767 100644
--- a/toolkit/components/osfile/Makefile.in
+++ b/toolkit/components/osfile/Makefile.in
@@ -26,5 +26,6 @@ libs::
 	$(NSINSTALL) $(srcdir)/osfile_shared.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/osfile_unix_back.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/osfile_unix_front.jsm $(FINAL_TARGET)/modules/osfile
+	$(NSINSTALL) $(srcdir)/ospath_win_back.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/osfile_win_back.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/osfile_win_front.jsm $(FINAL_TARGET)/modules/osfile
diff --git a/toolkit/components/osfile/osfile_win_back.jsm b/toolkit/components/osfile/osfile_win_back.jsm
index cab60098403..765d98cf7b9 100644
--- a/toolkit/components/osfile/osfile_win_back.jsm
+++ b/toolkit/components/osfile/osfile_win_back.jsm
@@ -308,254 +308,6 @@
                     /*overlapped*/Types.void_t.inout_ptr // FIXME: Implement?
          );
 
-        /**
-         * Utility function: check that a path is not a UNC path,
-         * as the current implementation of |Path| does not support
-         * UNC grammars.
-         *
-         * We consider that any path starting with "\\\\" is a UNC path.
-         */
-        let ensureNotUNC = function ensureNotUNC(path) {
-           if (!path) {
-              throw new TypeError("Expecting a non-null path");
-           }
-           if (path.length >= 2 && path[0] == "\\" && path[1] == "\\") {
-              throw new Error("Module Path cannot handle UNC-formatted paths yet: " + path);
-           }
-        };
-
-        /**
-         * Utility function: Remove any leading/trailing backslashes
-         * from a string.
-         */
-        let trimBackslashes = function trimBackslashes(string) {
-          return string.replace(/^\\+|\\+$/g,'');
-        };
-
-        /**
-         * Handling native paths.
-         *
-         * This module contains a number of functions destined to simplify
-         * working with native paths through a cross-platform API. Functions
-         * of this module will only work with the following assumptions:
-         *
-         * - paths are valid;
-         * - paths are defined with one of the grammars that this module can
-         *   parse (see later);
-         * - all path concatenations go through function |join|.
-         *
-         * Limitations of this implementation.
-         *
-         * Windows supports 6 distinct grammars for paths. For the moment, this
-         * implementation supports the following subset:
-         *
-         * - drivename:backslash-separated components
-         * - backslash-separated components
-         *
-         * Additionally, |normalize| can convert a path containing slash-
-         * separated components to a path containing backslash-separated
-         * components.
-         */
-       exports.OS.Win.Path = {
-         /**
-          * Return the final part of the path.
-          * The final part of the path is everything after the last "\\".
-          */
-         basename: function basename(path) {
-           ensureNotUNC(path);
-           return path.slice(Math.max(path.lastIndexOf("\\"),
-             path.lastIndexOf(":")) + 1);
-         },
-
-         /**
-          * Return the directory part of the path.  The directory part
-          * of the path is everything before the last "\\", including
-          * the drive/server name.
-          *
-          * If the path contains no directory, return the drive letter,
-          * or "." if the path contains no drive letter or if option
-          * |winNoDrive| is set.
-          *
-          * @param {string} path The path.
-          * @param {*=} options Platform-specific options controlling the behavior
-          * of this function. This implementation supports the following options:
-          *  - |winNoDrive| If |true|, also remove the letter from the path name.
-          */
-         dirname: function dirname(path, options) {
-           ensureNotUNC(path);
-           let noDrive = (options && options.winNoDrive);
-
-           // Find the last occurrence of "\\"
-           let index = path.lastIndexOf("\\");
-           if (index == -1) {
-             // If there is no directory component...
-             if (!noDrive) {
-               // Return the drive path if possible, falling back to "."
-               return this.winGetDrive(path) || ".";
-             } else {
-               // Or just "."
-               return ".";
-             }
-           }
-
-           // Ignore any occurrence of "\\: immediately before that one
-           while (index >= 0 && path[index] == "\\") {
-             --index;
-           }
-
-           // Compute what is left, removing the drive name if necessary
-           let start;
-           if (noDrive) {
-             start = (this.winGetDrive(path) || "").length;
-           } else {
-             start = 0;
-           }
-           return path.slice(start, index + 1);
-         },
-
-         /**
-          * Join path components.
-          * This is the recommended manner of getting the path of a file/subdirectory
-          * in a directory.
-          *
-          * Example: Obtaining $TMP/foo/bar in an OS-independent manner
-          *  var tmpDir = OS.Path.to("TmpD");
-          *  var path = OS.Path.join(tmpDir, "foo", "bar");
-          *
-          * Under Windows, this will return "$TMP\foo\bar".
-          */
-         join: function join(path /*...*/) {
-           let paths = [];
-           let root;
-           let absolute = false;
-           for each(let subpath in arguments) {
-             let drive = this.winGetDrive(subpath);
-             let abs   = this.winIsAbsolute(subpath);
-             if (drive) {
-               root = drive;
-               paths = [trimBackslashes(subpath.slice(drive.length))];
-               absolute = abs;
-             } else if (abs) {
-               paths = [trimBackslashes(subpath)];
-               absolute = true;
-             } else {
-               paths.push(trimBackslashes(subpath));
-             }
-           }
-           let result = "";
-           if (root) {
-             result += root;
-           }
-           if (absolute) {
-             result += "\\";
-           }
-           result += paths.join("\\");
-           return result;
-         },
-
-         /**
-          * Return the drive letter of a path, or |null| if the
-          * path does not contain a drive letter.
-          */
-         winGetDrive: function winGetDrive(path) {
-           ensureNotUNC(path);
-           let index = path.indexOf(":");
-           if (index <= 0) return null;
-           return path.slice(0, index + 1);
-         },
-
-         /**
-          * Return |true| if the path is absolute, |false| otherwise.
-          *
-          * We consider that a path is absolute if it starts with "\\"
-          * or "driveletter:\\".
-          */
-         winIsAbsolute: function winIsAbsolute(path) {
-           ensureNotUNC(path);
-           return this._winIsAbsolute(path);
-         },
-         /**
-          * As |winIsAbsolute|, but does not check for UNC.
-          * Useful mostly as an internal utility, for normalization.
-          */
-         _winIsAbsolute: function _winIsAbsolute(path) {
-           let index = path.indexOf(":");
-           return path.length > index + 1 && path[index + 1] == "\\";
-         },
-
-         /**
-          * Normalize a path by removing any unneeded ".", "..", "\\".
-          * Also convert any "/" to a "\\".
-          */
-         normalize: function normalize(path) {
-           let stack = [];
-
-           // Remove the drive (we will put it back at the end)
-           let root = this.winGetDrive(path);
-           if (root) {
-             path = path.slice(root.length);
-           }
-
-           // Remember whether we need to restore a leading "\\".
-           let absolute = this._winIsAbsolute(path);
-
-           // Normalize "/" to "\\"
-           path = path.replace("/", "\\");
-
-           // And now, fill |stack| from the components,
-           // popping whenever there is a ".."
-           path.split("\\").forEach(function loop(v) {
-             switch (v) {
-             case "":  case ".": // Ignore
-               break;
-             case "..":
-               if (stack.length == 0) {
-                 if (absolute) {
-                   throw new Error("Path is ill-formed: attempting to go past root");
-                 } else {
-                  stack.push("..");
-                 }
-               } else {
-                 stack.pop();
-               }
-               break;
-             default:
-               stack.push(v);
-             }
-           });
-
-           // Put everything back together
-           let result = stack.join("\\");
-           if (absolute) {
-             result = "\\" + result;
-           }
-           if (root) {
-             result = root + result;
-           }
-           return result;
-         },
-
-         /**
-          * Return the components of a path.
-          * You should generally apply this function to a normalized path.
-          *
-          * @return {{
-          *   {bool} absolute |true| if the path is absolute, |false| otherwise
-          *   {array} components the string components of the path
-          *   {string?} winDrive the drive or server for this path
-          * }}
-          *
-          * Other implementations may add additional OS-specific informations.
-          */
-         split: function split(path) {
-           return {
-             absolute: this.winIsAbsolute(path),
-             winDrive: this.winGetDrive(path),
-             components: path.split("\\")
-           };
-         }
-       };
-
        // Export useful stuff for extensibility
 
        exports.OS.Win.libc = libc;
diff --git a/toolkit/components/osfile/osfile_win_front.jsm b/toolkit/components/osfile/osfile_win_front.jsm
index 24bff84fd22..27eaae151af 100644
--- a/toolkit/components/osfile/osfile_win_front.jsm
+++ b/toolkit/components/osfile/osfile_win_front.jsm
@@ -18,6 +18,7 @@
 
   importScripts("resource://gre/modules/osfile/osfile_shared.jsm");
   importScripts("resource://gre/modules/osfile/osfile_win_back.jsm");
+  importScripts("resource://gre/modules/osfile/ospath_win_back.jsm");
 
   (function(exports) {
      "use strict";
diff --git a/toolkit/components/osfile/ospath_win_back.jsm b/toolkit/components/osfile/ospath_win_back.jsm
new file mode 100644
index 00000000000..7687e2d3a17
--- /dev/null
+++ b/toolkit/components/osfile/ospath_win_back.jsm
@@ -0,0 +1,259 @@
+/**
+ * Handling native paths.
+ *
+ * This module contains a number of functions destined to simplify
+ * working with native paths through a cross-platform API. Functions
+ * of this module will only work with the following assumptions:
+ *
+ * - paths are valid;
+ * - paths are defined with one of the grammars that this module can
+ *   parse (see later);
+ * - all path concatenations go through function |join|.
+ *
+ * Limitations of this implementation.
+ *
+ * Windows supports 6 distinct grammars for paths. For the moment, this
+ * implementation supports the following subset:
+ *
+ * - drivename:backslash-separated components
+ * - backslash-separated components
+ *
+ * Additionally, |normalize| can convert a path containing slash-
+ * separated components to a path containing backslash-separated
+ * components.
+ */
+(function(exports) {
+   "use strict";
+   if (!exports.OS) {
+     exports.OS = {};
+   }
+   if (!exports.OS.Win) {
+     exports.OS.Win = {};
+   }
+   if (exports.OS.Win.Path) {
+     return; // Avoid double-initialization
+   }
+   exports.OS.Win.Path = {
+     /**
+      * Return the final part of the path.
+      * The final part of the path is everything after the last "\\".
+      */
+     basename: function basename(path) {
+       ensureNotUNC(path);
+       return path.slice(Math.max(path.lastIndexOf("\\"),
+         path.lastIndexOf(":")) + 1);
+     },
+
+     /**
+      * Return the directory part of the path.  The directory part
+      * of the path is everything before the last "\\", including
+      * the drive/server name.
+      *
+      * If the path contains no directory, return the drive letter,
+      * or "." if the path contains no drive letter or if option
+      * |winNoDrive| is set.
+      *
+      * @param {string} path The path.
+      * @param {*=} options Platform-specific options controlling the behavior
+      * of this function. This implementation supports the following options:
+      *  - |winNoDrive| If |true|, also remove the letter from the path name.
+      */
+     dirname: function dirname(path, options) {
+       ensureNotUNC(path);
+       let noDrive = (options && options.winNoDrive);
+
+       // Find the last occurrence of "\\"
+       let index = path.lastIndexOf("\\");
+       if (index == -1) {
+         // If there is no directory component...
+         if (!noDrive) {
+           // Return the drive path if possible, falling back to "."
+           return this.winGetDrive(path) || ".";
+         } else {
+           // Or just "."
+           return ".";
+         }
+       }
+
+       // Ignore any occurrence of "\\: immediately before that one
+       while (index >= 0 && path[index] == "\\") {
+         --index;
+       }
+
+       // Compute what is left, removing the drive name if necessary
+       let start;
+       if (noDrive) {
+         start = (this.winGetDrive(path) || "").length;
+       } else {
+         start = 0;
+       }
+       return path.slice(start, index + 1);
+     },
+
+     /**
+      * Join path components.
+      * This is the recommended manner of getting the path of a file/subdirectory
+      * in a directory.
+      *
+      * Example: Obtaining $TMP/foo/bar in an OS-independent manner
+      *  var tmpDir = OS.Path.to("TmpD");
+      *  var path = OS.Path.join(tmpDir, "foo", "bar");
+      *
+      * Under Windows, this will return "$TMP\foo\bar".
+      */
+     join: function join(path /*...*/) {
+       let paths = [];
+       let root;
+       let absolute = false;
+       for each(let subpath in arguments) {
+         let drive = this.winGetDrive(subpath);
+         let abs   = this.winIsAbsolute(subpath);
+         if (drive) {
+           root = drive;
+           paths = [trimBackslashes(subpath.slice(drive.length))];
+           absolute = abs;
+         } else if (abs) {
+           paths = [trimBackslashes(subpath)];
+           absolute = true;
+         } else {
+           paths.push(trimBackslashes(subpath));
+         }
+       }
+       let result = "";
+       if (root) {
+         result += root;
+       }
+       if (absolute) {
+         result += "\\";
+       }
+       result += paths.join("\\");
+       return result;
+     },
+
+     /**
+      * Return the drive letter of a path, or |null| if the
+      * path does not contain a drive letter.
+      */
+     winGetDrive: function winGetDrive(path) {
+       ensureNotUNC(path);
+       let index = path.indexOf(":");
+       if (index <= 0) return null;
+       return path.slice(0, index + 1);
+     },
+
+     /**
+      * Return |true| if the path is absolute, |false| otherwise.
+      *
+      * We consider that a path is absolute if it starts with "\\"
+      * or "driveletter:\\".
+      */
+     winIsAbsolute: function winIsAbsolute(path) {
+       ensureNotUNC(path);
+       return this._winIsAbsolute(path);
+     },
+     /**
+      * As |winIsAbsolute|, but does not check for UNC.
+      * Useful mostly as an internal utility, for normalization.
+      */
+     _winIsAbsolute: function _winIsAbsolute(path) {
+       let index = path.indexOf(":");
+       return path.length > index + 1 && path[index + 1] == "\\";
+     },
+
+     /**
+      * Normalize a path by removing any unneeded ".", "..", "\\".
+      * Also convert any "/" to a "\\".
+      */
+     normalize: function normalize(path) {
+       let stack = [];
+
+       // Remove the drive (we will put it back at the end)
+       let root = this.winGetDrive(path);
+       if (root) {
+         path = path.slice(root.length);
+       }
+
+       // Remember whether we need to restore a leading "\\".
+       let absolute = this._winIsAbsolute(path);
+
+       // Normalize "/" to "\\"
+       path = path.replace("/", "\\");
+
+       // And now, fill |stack| from the components,
+       // popping whenever there is a ".."
+       path.split("\\").forEach(function loop(v) {
+         switch (v) {
+         case "":  case ".": // Ignore
+           break;
+         case "..":
+           if (stack.length == 0) {
+             if (absolute) {
+               throw new Error("Path is ill-formed: attempting to go past root");
+             } else {
+              stack.push("..");
+             }
+           } else {
+             stack.pop();
+           }
+           break;
+         default:
+           stack.push(v);
+         }
+       });
+
+       // Put everything back together
+       let result = stack.join("\\");
+       if (absolute) {
+         result = "\\" + result;
+       }
+       if (root) {
+         result = root + result;
+       }
+       return result;
+     },
+
+     /**
+      * Return the components of a path.
+      * You should generally apply this function to a normalized path.
+      *
+      * @return {{
+      *   {bool} absolute |true| if the path is absolute, |false| otherwise
+      *   {array} components the string components of the path
+      *   {string?} winDrive the drive or server for this path
+      * }}
+      *
+      * Other implementations may add additional OS-specific informations.
+      */
+     split: function split(path) {
+       return {
+         absolute: this.winIsAbsolute(path),
+         winDrive: this.winGetDrive(path),
+         components: path.split("\\")
+       };
+     }
+   };
+
+    /**
+     * Utility function: check that a path is not a UNC path,
+     * as the current implementation of |Path| does not support
+     * UNC grammars.
+     *
+     * We consider that any path starting with "\\\\" is a UNC path.
+     */
+    let ensureNotUNC = function ensureNotUNC(path) {
+       if (!path) {
+          throw new TypeError("Expecting a non-null path");
+       }
+       if (path.length >= 2 && path[0] == "\\" && path[1] == "\\") {
+          throw new Error("Module Path cannot handle UNC-formatted paths yet: " + path);
+       }
+    };
+
+    /**
+     * Utility function: Remove any leading/trailing backslashes
+     * from a string.
+     */
+    let trimBackslashes = function trimBackslashes(string) {
+      return string.replace(/^\\+|\\+$/g,'');
+    };
+}(this));

From 84f538fea617843f75d50d527216821416a2163a Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Wed, 18 Jul 2012 21:09:14 -0400
Subject: [PATCH 091/118] Bug 769310 - Unix paths. r=taras

---
 toolkit/components/osfile/Makefile.in         |   1 +
 .../components/osfile/osfile_unix_back.jsm    | 102 --------------
 .../components/osfile/osfile_unix_front.jsm   |   1 +
 .../components/osfile/ospath_unix_back.jsm    | 128 ++++++++++++++++++
 4 files changed, 130 insertions(+), 102 deletions(-)
 create mode 100644 toolkit/components/osfile/ospath_unix_back.jsm

diff --git a/toolkit/components/osfile/Makefile.in b/toolkit/components/osfile/Makefile.in
index b9484fce767..c63a27f5c71 100644
--- a/toolkit/components/osfile/Makefile.in
+++ b/toolkit/components/osfile/Makefile.in
@@ -25,6 +25,7 @@ include $(topsrcdir)/config/rules.mk
 libs::
 	$(NSINSTALL) $(srcdir)/osfile_shared.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/osfile_unix_back.jsm $(FINAL_TARGET)/modules/osfile
+	$(NSINSTALL) $(srcdir)/ospath_unix_back.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/osfile_unix_front.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/ospath_win_back.jsm $(FINAL_TARGET)/modules/osfile
 	$(NSINSTALL) $(srcdir)/osfile_win_back.jsm $(FINAL_TARGET)/modules/osfile
diff --git a/toolkit/components/osfile/osfile_unix_back.jsm b/toolkit/components/osfile/osfile_unix_back.jsm
index b8769b057b9..9f4ef23ff94 100644
--- a/toolkit/components/osfile/osfile_unix_back.jsm
+++ b/toolkit/components/osfile/osfile_unix_back.jsm
@@ -470,108 +470,6 @@
          return result;
        };
 
-
-       exports.OS.Unix.Path = {
-         /**
-          * Return the final part of the path.
-          * The final part of the path is everything after the last "/".
-          */
-         basename: function basename(path) {
-           return path.slice(path.lastIndexOf("/") + 1);
-         },
-         /**
-          * Return the directory part of the path.
-          * The directory part of the path is everything before the last
-          * "/". If the last few characters of this part are also "/",
-          * they are ignored.
-          *
-          * If the path contains no directory, return ".".
-          */
-         dirname: function dirname(path) {
-           let index = path.lastIndexOf("/");
-           if (index == -1) {
-             return ".";
-           }
-           while (index >= 0 && path[index] == "/") {
-             --index;
-           }
-           return path.slice(0, index + 1);
-         },
-         /**
-          * Join path components.
-          * This is the recommended manner of getting the path of a file/subdirectory
-          * in a directory.
-          *
-          * Example: Obtaining $TMP/foo/bar in an OS-independent manner
-          *  var tmpDir = OS.Path.to("TmpD");
-          *  var path = OS.Path.join(tmpDir, "foo", "bar");
-          *
-          * Under Unix, this will return "/tmp/foo/bar".
-          */
-         join: function join(path /*...*/) {
-           // If there is a path that starts with a "/", eliminate everything before
-           let paths = [];
-           for each(let i in arguments) {
-             if (i.length != 0 && i[0] == "/") {
-               paths = [i];
-             } else {
-               paths.push(i);
-             }
-           }
-           return paths.join("/");
-         },
-         /**
-          * Normalize a path by removing any unneeded ".", "..", "//".
-          */
-         normalize: function normalize(path) {
-           let stack = [];
-           let absolute;
-           if (path.length >= 0 && path[0] == "/") {
-             absolute = true;
-           } else {
-             absolute = false;
-           }
-           path.split("/").forEach(function loop(v) {
-             switch (v) {
-             case "":  case ".":// fallthrough
-               break;
-             case "..":
-               if (stack.length == 0) {
-                 if (absolute) {
-                   throw new Error("Path is ill-formed: attempting to go past root");
-                 } else {
-                   stack.push("..");
-                 }
-               } else {
-                 stack.pop();
-               }
-               break;
-             default:
-               stack.push(v);
-             }
-           });
-           let string = stack.join("/");
-           return absolute ? "/" + string : string;
-         },
-         /**
-          * Return the components of a path.
-          * You should generally apply this function to a normalized path.
-          *
-          * @return {{
-          *   {bool} absolute |true| if the path is absolute, |false| otherwise
-          *   {array} components the string components of the path
-          * }}
-          *
-          * Other implementations may add additional OS-specific informations.
-          */
-         split: function split(path) {
-           return {
-             absolute: path.length && path[0] == "/",
-             components: path.split("/")
-           };
-         }
-       };
-
        // Export useful stuff for extensibility
 
        exports.OS.Unix.libc = libc;
diff --git a/toolkit/components/osfile/osfile_unix_front.jsm b/toolkit/components/osfile/osfile_unix_front.jsm
index f21f415efce..897a38a5a9f 100644
--- a/toolkit/components/osfile/osfile_unix_front.jsm
+++ b/toolkit/components/osfile/osfile_unix_front.jsm
@@ -18,6 +18,7 @@
   }
   importScripts("resource://gre/modules/osfile/osfile_shared.jsm");
   importScripts("resource://gre/modules/osfile/osfile_unix_back.jsm");
+  importScripts("resource://gre/modules/osfile/ospath_unix_back.jsm");
   (function(exports) {
      "use strict";
 
diff --git a/toolkit/components/osfile/ospath_unix_back.jsm b/toolkit/components/osfile/ospath_unix_back.jsm
new file mode 100644
index 00000000000..522e39bc8a6
--- /dev/null
+++ b/toolkit/components/osfile/ospath_unix_back.jsm
@@ -0,0 +1,128 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Handling native paths.
+ *
+ * This module contains a number of functions destined to simplify
+ * working with native paths through a cross-platform API. Functions
+ * of this module will only work with the following assumptions:
+ *
+ * - paths are valid;
+ * - paths are defined with one of the grammars that this module can
+ *   parse (see later);
+ * - all path concatenations go through function |join|.
+ */
+(function(exports) {
+   "use strict";
+   if (!exports.OS) {
+     exports.OS = {};
+   }
+   if (!exports.OS.Unix) {
+     exports.OS.Unix = {};
+   }
+   if (exports.OS.Unix.Path) {
+     return; // Avoid double-initialization
+   }
+   exports.OS.Unix.Path = {
+     /**
+      * Return the final part of the path.
+      * The final part of the path is everything after the last "/".
+      */
+     basename: function basename(path) {
+       return path.slice(path.lastIndexOf("/") + 1);
+     },
+     /**
+      * Return the directory part of the path.
+      * The directory part of the path is everything before the last
+      * "/". If the last few characters of this part are also "/",
+      * they are ignored.
+      *
+      * If the path contains no directory, return ".".
+      */
+     dirname: function dirname(path) {
+       let index = path.lastIndexOf("/");
+       if (index == -1) {
+         return ".";
+       }
+       while (index >= 0 && path[index] == "/") {
+         --index;
+       }
+       return path.slice(0, index + 1);
+     },
+     /**
+      * Join path components.
+      * This is the recommended manner of getting the path of a file/subdirectory
+      * in a directory.
+      *
+      * Example: Obtaining $TMP/foo/bar in an OS-independent manner
+      *  var tmpDir = OS.Path.to("TmpD");
+      *  var path = OS.Path.join(tmpDir, "foo", "bar");
+      *
+      * Under Unix, this will return "/tmp/foo/bar".
+      */
+     join: function join(path /*...*/) {
+       // If there is a path that starts with a "/", eliminate everything before
+       let paths = [];
+       for each(let i in arguments) {
+         if (i.length != 0 && i[0] == "/") {
+           paths = [i];
+         } else {
+           paths.push(i);
+         }
+       }
+       return paths.join("/");
+     },
+     /**
+      * Normalize a path by removing any unneeded ".", "..", "//".
+      */
+     normalize: function normalize(path) {
+       let stack = [];
+       let absolute;
+       if (path.length >= 0 && path[0] == "/") {
+         absolute = true;
+       } else {
+         absolute = false;
+       }
+       path.split("/").forEach(function loop(v) {
+         switch (v) {
+         case "":  case ".":// fallthrough
+           break;
+         case "..":
+           if (stack.length == 0) {
+             if (absolute) {
+               throw new Error("Path is ill-formed: attempting to go past root");
+             } else {
+               stack.push("..");
+             }
+           } else {
+             stack.pop();
+           }
+           break;
+         default:
+           stack.push(v);
+         }
+       });
+       let string = stack.join("/");
+       return absolute ? "/" + string : string;
+     },
+     /**
+      * Return the components of a path.
+      * You should generally apply this function to a normalized path.
+      *
+      * @return {{
+      *   {bool} absolute |true| if the path is absolute, |false| otherwise
+      *   {array} components the string components of the path
+      * }}
+      *
+      * Other implementations may add additional OS-specific informations.
+      */
+     split: function split(path) {
+       return {
+         absolute: path.length && path[0] == "/",
+         components: path.split("/")
+       };
+     }
+   };
+}(this));

From c7b8baf87a33c287406cde5bd5909085d38941ad Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 18 Jul 2012 08:34:56 +0200
Subject: [PATCH 092/118] Bug 774772 - Fix webapprt l10n after bug 762864.
 r=bsmedberg

---
 toolkit/locales/l10n.mk               | 3 +++
 toolkit/mozapps/installer/packager.mk | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
index 5f54b9efa01..dc754d57332 100644
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -120,6 +120,9 @@ repackage-zip:  libs-$(AB_CD)
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
 	  tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
 	mv $(STAGEDIST)/chrome/$(AB_CD).manifest $(STAGEDIST)/chrome/localized.manifest
+ifdef MOZ_WEBAPP_RUNTIME
+	mv $(STAGEDIST)/webapprt/chrome/$(AB_CD).manifest $(STAGEDIST)/webapprt/chrome/localized.manifest
+endif
 ifneq (en,$(AB))
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/$(AB).lproj
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index cf2ef3d5ab6..c01daf00bc2 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -786,6 +786,10 @@ endif
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
 	  $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
 	  $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+ifdef MOZ_WEBAPP_RUNTIME
+	mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
+	sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+endif
 	printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
 else # !MOZ_PKG_MANIFEST
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)

From d9c2b1dca11a6d3fe7099095c1c8344eb50eab54 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Wed, 18 Jul 2012 19:45:58 +0300
Subject: [PATCH 093/118] Backout 486fd8f6d29d (bug 765564) for Linux bustage

---
 browser/base/content/browser-appmenu.inc      | 73 ++++++++++++++---
 browser/base/content/browser-menubar.inc      | 82 ++++++++++++++++---
 browser/base/content/browser-sets.inc         | 81 ++----------------
 browser/base/content/browser.css              |  6 --
 browser/base/content/browser.js               | 77 +++++++++++------
 browser/base/content/browser.xul              | 33 +++-----
 .../locales/en-US/chrome/browser/browser.dtd  |  1 -
 browser/themes/gnomestripe/browser.css        |  9 --
 browser/themes/pinstripe/browser.css          |  9 --
 browser/themes/winstripe/browser.css          |  9 --
 10 files changed, 200 insertions(+), 180 deletions(-)

diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index 32c78147db9..e7f32cb2545 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -142,19 +142,68 @@
       <menu id="appmenu_webDeveloper"
             label="&appMenuWebDeveloper.label;">
         <menupopup id="appmenu_webDeveloper_popup">
-          <menuitem id="appmenu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar"/>
-          <menuitem id="appmenu_webConsole" observes="devtoolsMenuBroadcaster_WebConsole" />
-          <menuitem id="appmenu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect"/>
-          <menuitem id="appmenu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
-          <menuitem id="appmenu_debugger" observes="devtoolsMenuBroadcaster_Debugger"/>
-          <menuitem id="appmenu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
-          <menuitem id="appmenu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
-          <menuitem id="appmenu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad"/>
-          <menuitem id="appmenu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor"/>
-          <menuitem id="appmenu_pageSource" observes="devtoolsMenuBroadcaster_PageSource"/>
-          <menuitem id="appmenu_errorConsole" observes="devtoolsMenuBroadcaster_ErrorConsole"/>
+          <menuitem id="appmenu_devToolbar"
+                    type="checkbox"
+                    autocheck="false"
+                    hidden="true"
+                    label="&devToolbarMenu.label;"
+                    command="Tools:DevToolbar"
+                    key="key_devToolbar"/>
+          <menuitem id="appmenu_webConsole"
+                    label="&webConsoleCmd.label;"
+                    type="checkbox"
+                    command="Tools:WebConsole"
+                    key="key_webConsole"/>
+          <menuitem id="appmenu_pageInspect"
+                    hidden="true"
+                    label="&inspectMenu.label;"
+                    type="checkbox"
+                    command="Tools:Inspect"
+                    key="key_inspect"/>
+          <menuitem id="appmenu_responsiveUI"
+                    hidden="true"
+                    label="&responsiveDesignTool.label;"
+                    type="checkbox"
+                    command="Tools:ResponsiveUI"
+                    key="key_responsiveUI"/>
+          <menuitem id="appmenu_debugger"
+                    hidden="true"
+                    type="checkbox"
+                    label="&debuggerMenu.label2;"
+                    key="key_debugger"
+                    command="Tools:Debugger"/>
+          <menuitem id="appmenu_remoteDebugger"
+                    hidden="true"
+                    label="&remoteDebuggerMenu.label;"
+                    command="Tools:RemoteDebugger"/>
+          <menuitem id="appmenu_chromeDebugger"
+                    hidden="true"
+                    label="&chromeDebuggerMenu.label;"
+                    command="Tools:ChromeDebugger"/>
+          <menuitem id="appmenu_scratchpad"
+                    hidden="true"
+                    label="&scratchpad.label;"
+                    key="key_scratchpad"
+                    command="Tools:Scratchpad"/>
+          <menuitem id="appmenu_styleeditor"
+                    hidden="true"
+                    type="checkbox"
+                    label="&styleeditor.label;"
+                    key="key_styleeditor"
+                    command="Tools:StyleEditor"/>
+          <menuitem id="appmenu_pageSource"
+                    label="&viewPageSourceCmd.label;"
+                    command="View:PageSource"
+                    key="key_viewSource"/>
+          <menuitem id="appmenu_errorConsole"
+                    hidden="true"
+                    label="&errorConsoleCmd.label;"
+                    key="key_errorConsole"
+                    oncommand="toJavaScriptConsole();"/>
           <menuseparator id="appmenu_devToolsEndSeparator"/>
-          <menuitem id="appmenu_getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools"/>
+          <menuitem id="appmenu_getMoreDevtools"
+                    label="&getMoreDevtoolsCmd.label;"
+                    oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
           <menuseparator/>
 #define ID_PREFIX appmenu_developer_
 #define OMIT_ACCESSKEYS
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index f49bba99db3..8dd6a3c2338 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -514,19 +514,77 @@
                     label="&webDeveloperMenu.label;"
                     accesskey="&webDeveloperMenu.accesskey;">
                 <menupopup id="menuWebDeveloperPopup">
-                  <menuitem id="menu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar" accesskey="&devToolbarMenu.accesskey;"/>
-                  <menuitem id="webConsole" observes="devtoolsMenuBroadcaster_WebConsole" accesskey="&webConsoleCmd.accesskey;"/>
-                  <menuitem id="menu_pageinspect" observes="devtoolsMenuBroadcaster_Inspect" accesskey="&inspectMenu.accesskey;"/>
-                  <menuitem id="menu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI" accesskey="&responsiveDesignTool.accesskey;"/>
-                  <menuitem id="menu_debugger" observes="devtoolsMenuBroadcaster_Debugger"/>
-                  <menuitem id="menu_remoteDebugger" observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
-                  <menuitem id="menu_chromeDebugger" observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
-                  <menuitem id="menu_scratchpad" observes="devtoolsMenuBroadcaster_Scratchpad" accesskey="&scratchpad.accesskey;"/>
-                  <menuitem id="menu_styleeditor" observes="devtoolsMenuBroadcaster_StyleEditor" accesskey="&styleeditor.accesskey;"/>
-                  <menuitem id="menu_pageSource" observes="devtoolsMenuBroadcaster_PageSource" accesskey="&pageSourceCmd.accesskey;"/>
-                  <menuitem id="javascriptConsole" observes="devtoolsMenuBroadcaster_ErrorConsole" accesskey="&errorConsoleCmd.accesskey;"/>
+                  <menuitem id="menu_devToolbar"
+                            type="checkbox"
+                            autocheck="false"
+                            hidden="true"
+                            label="&devToolbarMenu.label;"
+                            accesskey="&devToolbarMenu.accesskey;"
+                            key="key_devToolbar"
+                            command="Tools:DevToolbar"/>
+                  <menuitem id="webConsole"
+                            type="checkbox"
+                            label="&webConsoleCmd.label;"
+                            accesskey="&webConsoleCmd.accesskey;"
+                            key="key_webConsole"
+                            command="Tools:WebConsole"/>
+                  <menuitem id="menu_pageinspect"
+                            type="checkbox"
+                            hidden="true"
+                            label="&inspectMenu.label;"
+                            accesskey="&inspectMenu.accesskey;"
+                            key="key_inspect"
+                            command="Tools:Inspect"/>
+                  <menuitem id="menu_responsiveUI"
+                            type="checkbox"
+                            hidden="true"
+                            label="&responsiveDesignTool.label;"
+                            accesskey="&responsiveDesignTool.accesskey;"
+                            key="key_responsiveUI"
+                            command="Tools:ResponsiveUI"/>
+                  <menuitem id="menu_debugger"
+                            hidden="true"
+                            type="checkbox"
+                            label="&debuggerMenu.label2;"
+                            key="key_debugger"
+                            command="Tools:Debugger"/>
+                  <menuitem id="menu_remoteDebugger"
+                            hidden="true"
+                            label="&remoteDebuggerMenu.label;"
+                            command="Tools:RemoteDebugger"/>
+                  <menuitem id="menu_chromeDebugger"
+                            hidden="true"
+                            label="&chromeDebuggerMenu.label;"
+                            command="Tools:ChromeDebugger"/>
+                  <menuitem id="menu_scratchpad"
+                            hidden="true"
+                            label="&scratchpad.label;"
+                            accesskey="&scratchpad.accesskey;"
+                            key="key_scratchpad"
+                            command="Tools:Scratchpad"/>
+                  <menuitem id="menu_styleeditor"
+                            type="checkbox"
+                            hidden="true"
+                            label="&styleeditor.label;"
+                            accesskey="&styleeditor.accesskey;"
+                            key="key_styleeditor"
+                            command="Tools:StyleEditor"/>
+                  <menuitem id="menu_pageSource"
+                            accesskey="&pageSourceCmd.accesskey;"
+                            label="&pageSourceCmd.label;"
+                            key="key_viewSource"
+                            command="View:PageSource"/>
+                  <menuitem id="javascriptConsole"
+                            hidden="true"
+                            label="&errorConsoleCmd.label;"
+                            accesskey="&errorConsoleCmd.accesskey;"
+                            key="key_errorConsole"
+                            oncommand="toJavaScriptConsole();"/>
                   <menuseparator id="devToolsEndSeparator"/>
-                  <menuitem id="getMoreDevtools" observes="devtoolsMenuBroadcaster_GetMoreTools" accesskey="&getMoreDevtoolsCmd.accesskey;"/>
+                  <menuitem id="getMoreDevtools"
+                            label="&getMoreDevtoolsCmd.label;"
+                            accesskey="&getMoreDevtoolsCmd.accesskey;"
+                            oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index bde3f403bcd..4d8404ef59b 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -88,16 +88,16 @@
 
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
-    <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();"/>
+    <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();" disabled="true"/>
     <command id="Tools:DevToolbarFocus" oncommand="DeveloperToolbar.focus();" disabled="true"/>
     <command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/>
-    <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();"/>
-    <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();"/>
-    <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();"/>
-    <command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();"/>
-    <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();"/>
-    <command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();"/>
-    <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();"/>
+    <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
+    <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();" disabled="true"/>
+    <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();" disabled="true"/>
+    <command id="Tools:ChromeDebugger" oncommand="DebuggerUI.toggleChromeDebugger();" disabled="true"/>
+    <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true"/>
+    <command id="Tools:StyleEditor" oncommand="StyleEditor.toggle();" disabled="true"/>
+    <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();" disabled="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
@@ -181,71 +181,6 @@
     <broadcaster id="sync-syncnow-state"/>
 #endif
     <broadcaster id="workOfflineMenuitemState"/>
-
-    <!-- DevTools broadcasters -->
-    <broadcaster id="devtoolsMenuBroadcaster_DevToolbar"
-                 label="&devToolbarMenu.label;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:DevToolbar"
-                 key="key_devToolbar"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_WebConsole"
-                 label="&webConsoleCmd.label;"
-                 type="checkbox" autocheck="false"
-                 key="key_webConsole"
-                 command="Tools:WebConsole"/>
-    <broadcaster id="devtoolsMenuBroadcaster_Inspect"
-                 label="&inspectMenu.label;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:Inspect"
-                 key="key_inspect"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_Debugger"
-                 label="&debuggerMenu.label2;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:Debugger"
-                 key="key_debugger"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_RemoteDebugger"
-                 label="&remoteDebuggerMenu.label;"
-                 command="Tools:RemoteDebugger"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_ChromeDebugger"
-                 label="&chromeDebuggerMenu.label;"
-                 command="Tools:ChromeDebugger"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_Scratchpad"
-                 label="&scratchpad.label;"
-                 command="Tools:Scratchpad"
-                 key="key_scratchpad"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_StyleEditor"
-                 label="&styleeditor.label;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:StyleEditor"
-                 key="key_styleeditor"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_ResponsiveUI"
-                 label="&responsiveDesignTool.label;"
-                 type="checkbox" autocheck="false"
-                 command="Tools:ResponsiveUI"
-                 key="key_responsiveUI"
-                 disabled="true" hidden="true"/>
-    <broadcaster id="devtoolsMenuBroadcaster_PageSource"
-                 accesskey="&pageSourceCmd.accesskey;"
-                 label="&pageSourceCmd.label;"
-                 key="key_viewSource"
-                 command="View:PageSource"/>
-    <broadcaster id="devtoolsMenuBroadcaster_ErrorConsole"
-                 hidden="true"
-                 label="&errorConsoleCmd.label;"
-                 accesskey="&errorConsoleCmd.accesskey;"
-                 key="key_errorConsole"
-                 oncommand="toJavaScriptConsole();"/>
-    <broadcaster id="devtoolsMenuBroadcaster_GetMoreTools"
-                 label="&getMoreDevtoolsCmd.label;"
-                 accesskey="&getMoreDevtoolsCmd.accesskey;"
-                 oncommand="openUILinkIn('https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/', 'tab');"/>
   </broadcasterset>
 
   <keyset id="mainKeyset">
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index f81561a8bd9..181c81b7b95 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -578,12 +578,6 @@ html|*#gcli-output-frame,
   -moz-box-pack: center;
 }
 
-/* We don't show the Style Editor button in the developer toolbar for now.
-   See bug 771203 */
-#developer-toolbar-styleeditor {
-  display: none;
-}
-
 /* Responsive Mode */
 
 vbox[anonid=browserContainer][responsivemode] {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 6f2b5b5b233..0edd9493b13 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1402,10 +1402,12 @@ var gBrowserInit = {
     // Enable developer toolbar?
     let devToolbarEnabled = gPrefService.getBoolPref("devtools.toolbar.enabled");
     if (devToolbarEnabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_DevToolbar");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_devToolbar").hidden = false;
+      document.getElementById("Tools:DevToolbar").removeAttribute("disabled");
       document.getElementById("Tools:DevToolbarFocus").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_devToolbar").hidden = false;
+#endif
 
       // Show the toolbar if it was previously visible
       if (gPrefService.getBoolPref("devtools.toolbar.visible")) {
@@ -1416,25 +1418,33 @@ var gBrowserInit = {
     // Enable Inspector?
     let enabled = gPrefService.getBoolPref("devtools.inspector.enabled");
     if (enabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Inspect");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_pageinspect").hidden = false;
+      document.getElementById("Tools:Inspect").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_pageInspect").hidden = false;
+#endif
+      document.getElementById("developer-toolbar-inspector").hidden = false;
     }
 
     // Enable Debugger?
     let enabled = gPrefService.getBoolPref("devtools.debugger.enabled");
     if (enabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Debugger");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_debugger").hidden = false;
+      document.getElementById("Tools:Debugger").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_debugger").hidden = false;
+#endif
+      document.getElementById("developer-toolbar-debugger").hidden = false;
     }
 
     // Enable Remote Debugger?
     let enabled = gPrefService.getBoolPref("devtools.debugger.remote-enabled");
     if (enabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_RemoteDebugger");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_remoteDebugger").hidden = false;
+      document.getElementById("Tools:RemoteDebugger").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_remoteDebugger").hidden = false;
+#endif
     }
 
     // Enable Chrome Debugger?
@@ -1442,34 +1452,45 @@ var gBrowserInit = {
                   gPrefService.getBoolPref("devtools.debugger.chrome-enabled") &&
                   gPrefService.getBoolPref("devtools.debugger.remote-enabled");
     if (enabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ChromeDebugger");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_chromeDebugger").hidden = false;
+      document.getElementById("Tools:ChromeDebugger").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_chromeDebugger").hidden = false;
+#endif
     }
 
     // Enable Error Console?
     // XXX Temporarily always-enabled, see bug 601201
     let consoleEnabled = true || gPrefService.getBoolPref("devtools.errorconsole.enabled");
     if (consoleEnabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ErrorConsole");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("javascriptConsole").hidden = false;
+      document.getElementById("key_errorConsole").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_errorConsole").hidden = false;
+#endif
     }
 
     // Enable Scratchpad in the UI, if the preference allows this.
     let scratchpadEnabled = gPrefService.getBoolPref(Scratchpad.prefEnabledName);
     if (scratchpadEnabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_Scratchpad");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_scratchpad").hidden = false;
+      document.getElementById("Tools:Scratchpad").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_scratchpad").hidden = false;
+#endif
     }
 
     // Enable Style Editor?
     let styleEditorEnabled = gPrefService.getBoolPref(StyleEditor.prefEnabledName);
     if (styleEditorEnabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_StyleEditor");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_styleeditor").hidden = false;
+      document.getElementById("Tools:StyleEditor").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_styleeditor").hidden = false;
+#endif
+      // We don't show the Style Editor button in the developer toolbar for now.
+      // See bug 771203
+      // document.getElementById("developer-toolbar-styleeditor").hidden = false;
     }
 
 #ifdef MENUBAR_CAN_AUTOHIDE
@@ -1484,9 +1505,11 @@ var gBrowserInit = {
     // Enable Responsive UI?
     let responsiveUIEnabled = gPrefService.getBoolPref("devtools.responsiveUI.enabled");
     if (responsiveUIEnabled) {
-      let broadcaster = document.getElementById("devtoolsMenuBroadcaster_ResponsiveUI");
-      broadcaster.removeAttribute("disabled");
-      broadcaster.removeAttribute("hidden");
+      document.getElementById("menu_responsiveUI").hidden = false;
+      document.getElementById("Tools:ResponsiveUI").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+      document.getElementById("appmenu_responsiveUI").hidden = false;
+#endif
     }
 
     let appMenuButton = document.getElementById("appmenu-button");
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index f7ff3be060a..fc9237d8a6b 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1125,35 +1125,24 @@
             <textbox class="gclitoolbar-input-node" rows="1"/>
           </stack>
           <toolbarbutton id="developer-toolbar-webconsole"
+                         label="&webConsoleButton.label;"
                          class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_WebConsole"/>
+                         command="Tools:WebConsole"/>
           <toolbarbutton id="developer-toolbar-inspector"
+                         label="&inspectorButton.label;"
                          class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_Inspect"/>
+                         hidden="true"
+                         command="Tools:Inspect"/>
           <toolbarbutton id="developer-toolbar-styleeditor"
+                         label="&styleeditor.label;"
                          class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_StyleEditor"/>
+                         hidden="true"
+                         command="Tools:StyleEditor"/>
           <toolbarbutton id="developer-toolbar-debugger"
+                         label="&debuggerMenu.label2;"
                          class="developer-toolbar-button"
-                         observes="devtoolsMenuBroadcaster_Debugger"/>
-          <toolbarbutton id="developer-toolbar-other-tools"
-                         type="menu"
-                         class="developer-toolbar-button"
-                         label="&devToolbarOtherToolsButton.label;">
-            <menupopup position="before_end">
-               <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/>
-               <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/>
-               <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/>
-               <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/>
-               <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/>
-               <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/>
-               <menuitem observes="devtoolsMenuBroadcaster_PageSource"/>
-               <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/>
-               <menuseparator/>
-               <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/>
-            </menupopup>
-          </toolbarbutton>
-
+                         hidden="true"
+                         command="Tools:Debugger"/>
 #ifndef XP_MACOSX
           <toolbarbutton id="developer-toolbar-closebutton"
                          class="devtools-closebutton"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 468aa455669..36cb4e39add 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -241,7 +241,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
-<!ENTITY devToolbarOtherToolsButton.label  "More Tools">
 
 <!ENTITY webConsoleButton.label "Web Console">
 <!ENTITY inspectorButton.label "Inspector">
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index 6b422e986a9..51b440aea5e 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -2551,7 +2551,6 @@ stack[anonid=browserStack][responsivemode] {
   list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
 }
 
-.developer-toolbar-button[open=true],
 .developer-toolbar-button:active:hover,
 .developer-toolbar-button[checked=true] {
   border-color: hsla(210,8%,5%,.6);
@@ -2581,14 +2580,6 @@ stack[anonid=browserStack][responsivemode] {
   -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 
-#developer-toolbar-other-tools {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
-}
-
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* Error counter */
 
 #developer-toolbar-webconsole[error-count]:before {
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index d6dd76eb617..679ff97c00b 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -3305,7 +3305,6 @@ stack[anonid=browserStack][responsivemode] {
   list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
 }
 
-.developer-toolbar-button[open=true],
 .developer-toolbar-button:active:hover,
 .developer-toolbar-button[checked=true] {
   border-color: hsla(210,8%,5%,.6);
@@ -3335,14 +3334,6 @@ stack[anonid=browserStack][responsivemode] {
   -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 
-#developer-toolbar-other-tools {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
-}
-
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* Error counter */
 
 #developer-toolbar-webconsole[error-count]:before {
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index 6ab89c67ecd..da599ccec6a 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -3232,7 +3232,6 @@ stack[anonid=browserStack][responsivemode] {
   list-style-image: url("chrome://browser/skin/devtools/tools-icons-small.png");
 }
 
-.developer-toolbar-button[open=true],
 .developer-toolbar-button:active:hover,
 .developer-toolbar-button[checked=true] {
   border-color: hsla(210,8%,5%,.6);
@@ -3262,14 +3261,6 @@ stack[anonid=browserStack][responsivemode] {
   -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 
-#developer-toolbar-other-tools {
-  -moz-image-region: rect(64px, 16px, 80px, 0);
-}
-
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* Error counter */
 
 #developer-toolbar-webconsole[error-count]:before {

From b3adb7faaeef6e15477e2fd5642056fd74dab629 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Wed, 18 Jul 2012 18:09:53 -0700
Subject: [PATCH 094/118] Bug 703279 - Follow up to add missing include. r=kats

---
 mobile/android/base/PromptService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/android/base/PromptService.java b/mobile/android/base/PromptService.java
index 1bcc8503c32..0d1e5a34940 100644
--- a/mobile/android/base/PromptService.java
+++ b/mobile/android/base/PromptService.java
@@ -35,6 +35,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.mozilla.gecko.gfx.LayerController;
 
 public class PromptService implements OnClickListener, OnCancelListener, OnItemClickListener, GeckoEventResponder {
     private static final String LOGTAG = "GeckoPromptService";

From 141ea58a3ee94c626c2aa7068a6156ac987426a4 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 19 Jul 2012 10:28:16 +0900
Subject: [PATCH 095/118] Bug 751749 part.1 Decide one modifier for a modifier
 flag r=karlt

---
 widget/gtk2/nsGtkKeyUtils.cpp | 132 ++++++++++++++++++++++++----------
 1 file changed, 96 insertions(+), 36 deletions(-)

diff --git a/widget/gtk2/nsGtkKeyUtils.cpp b/widget/gtk2/nsGtkKeyUtils.cpp
index a501811b785..41e3571c7f5 100644
--- a/widget/gtk2/nsGtkKeyUtils.cpp
+++ b/widget/gtk2/nsGtkKeyUtils.cpp
@@ -56,12 +56,8 @@ static const KeyPair kKeyPairs[] = {
     { NS_VK_CONTROL,    GDK_Control_R },
     { NS_VK_ALT,        GDK_Alt_L },
     { NS_VK_ALT,        GDK_Alt_R },
-
-    // NS_VK_META is used for Command key of Mac.  It's a modifier key for
-    // shortcut keys like Ctrl key on GTK or Windows.  So, it's really different
-    // from GTK's META key, we shouldn't use it on GTK.
-    // { NS_VK_META,       GDK_Meta_L },
-    // { NS_VK_META,       GDK_Meta_R },
+    { NS_VK_META,       GDK_Meta_L },
+    { NS_VK_META,       GDK_Meta_R },
 
     // Assume that Super or Hyper is always mapped to physical Win key.
     { NS_VK_WIN,        GDK_Super_L },
@@ -378,8 +374,16 @@ KeymapWrapper::InitBySystemSettings()
 
     // Note that two or more modifiers may use one modifier flag.  E.g.,
     // on Ubuntu 10.10, Alt and Meta share the Mod1 in default settings.
-    //  And also Super and Hyper share the Mod4.
+    // And also Super and Hyper share the Mod4. In such cases, we need to
+    // decide which modifier flag means one of DOM modifiers.
 
+    // mod[0] is Modifier introduced by Mod1.
+    Modifier mod[5];
+    PRInt32 foundLevel[5];
+    for (PRUint32 i = 0; i < ArrayLength(mod); i++) {
+        mod[i] = NOT_MODIFIER;
+        foundLevel[i] = PR_INT32_MAX;
+    }
     const PRUint32 map_size = 8 * xmodmap->max_keypermod;
     for (PRUint32 i = 0; i < map_size; i++) {
         KeyCode keycode = xmodmap->modifiermap[i];
@@ -400,44 +404,85 @@ KeymapWrapper::InitBySystemSettings()
             xkeymap + (keycode - min_keycode) * keysyms_per_keycode;
         const PRUint32 bit = i / xmodmap->max_keypermod;
         modifierKey->mMask |= 1 << bit;
+
+        // We need to know the meaning of Mod1, Mod2, Mod3, Mod4 and Mod5.
+        // Let's skip if current map is for others.
+        if (bit < 3) {
+            continue;
+        }
+
+        const PRInt32 modIndex = bit - 3;
         for (PRInt32 j = 0; j < keysyms_per_keycode; j++) {
             Modifier modifier = GetModifierForGDKKeyval(syms[j]);
             PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
                 ("KeymapWrapper(%p): InitBySystemSettings, "
-                 "    bit=%d, j=%d, syms[j]=%s(0x%X), modifier=%s",
-                 this, bit, j, gdk_keyval_name(syms[j]), syms[j],
+                 "    Mod%d, j=%d, syms[j]=%s(0x%X), modifier=%s",
+                 this, modIndex + 1, j, gdk_keyval_name(syms[j]), syms[j],
                  GetModifierName(modifier)));
 
-            ModifierIndex index;
             switch (modifier) {
-                case NUM_LOCK:
-                    index = INDEX_NUM_LOCK;
+                case NOT_MODIFIER:
+                    // Don't overwrite the stored information with
+                    // NOT_MODIFIER.
                     break;
-                case SCROLL_LOCK:
-                    index = INDEX_SCROLL_LOCK;
-                    break;
-                case ALT:
-                    index = INDEX_ALT;
-                    break;
-                case SUPER:
-                    index = INDEX_SUPER;
-                    break;
-                case HYPER:
-                    index = INDEX_HYPER;
-                    break;
-                case META:
-                    index = INDEX_META;
-                    break;
-                case ALTGR:
-                    index = INDEX_ALTGR;
+                case CAPS_LOCK:
+                case SHIFT:
+                case CTRL:
+                    // Ignore the modifiers defined in GDK spec. They shouldn't
+                    // be mapped to Mod1-5 because they must not work on native
+                    // GTK applications.
                     break;
                 default:
-                    // NOTE: We always use GDK_SHIFT_MASK, GDK_CONTROL_MASK and
-                    //       GDK_LOCK_MASK for SHIFT, CTRL and CAPS_LOCK.
-                    //       This is standard manners of GTK application.
-                    continue;
+                    // If new modifier is found in higher level than stored
+                    // value, we don't need to overwrite it.
+                    if (j > foundLevel[modIndex]) {
+                        break;
+                    }
+                    // If new modifier is more important than stored value,
+                    // we should overwrite it with new modifier.
+                    if (j == foundLevel[modIndex]) {
+                        mod[modIndex] = NS_MIN(modifier, mod[modIndex]);
+                        break;
+                    }
+                    foundLevel[modIndex] = j;
+                    mod[modIndex] = modifier;
+                    break;
+            }
+        }
+    }
+
+    for (PRUint32 i = 0; i < COUNT_OF_MODIFIER_INDEX; i++) {
+        Modifier modifier;
+        switch (i) {
+            case INDEX_NUM_LOCK:
+                modifier = NUM_LOCK;
+                break;
+            case INDEX_SCROLL_LOCK:
+                modifier = SCROLL_LOCK;
+                break;
+            case INDEX_ALT:
+                modifier = ALT;
+                break;
+            case INDEX_SUPER:
+                modifier = SUPER;
+                break;
+            case INDEX_HYPER:
+                modifier = HYPER;
+                break;
+            case INDEX_META:
+                modifier = META;
+                break;
+            case INDEX_ALTGR:
+                modifier = ALTGR;
+                break;
+            default:
+                MOZ_NOT_REACHED("All indexes must be handled here");
+                break;
+        }
+        for (PRUint32 j = 0; j < ArrayLength(mod); j++) {
+            if (modifier == mod[j]) {
+                mModifierMasks[i] |= 1 << (j + 3);
             }
-            mModifierMasks[index] |= 1 << bit;
         }
     }
 
@@ -534,6 +579,9 @@ KeymapWrapper::InitInputEvent(nsInputEvent& aInputEvent,
     if (keymapWrapper->AreModifiersActive(ALT, aModifierState)) {
         aInputEvent.modifiers |= MODIFIER_ALT;
     }
+    if (keymapWrapper->AreModifiersActive(META, aModifierState)) {
+        aInputEvent.modifiers |= MODIFIER_META;
+    }
     if (keymapWrapper->AreModifiersActive(SUPER, aModifierState) ||
         keymapWrapper->AreModifiersActive(HYPER, aModifierState)) {
         aInputEvent.modifiers |= MODIFIER_OS;
@@ -554,11 +602,13 @@ KeymapWrapper::InitInputEvent(nsInputEvent& aInputEvent,
     PR_LOG(gKeymapWrapperLog, PR_LOG_DEBUG,
         ("KeymapWrapper(%p): InitInputEvent, aModifierState=0x%08X, "
          "aInputEvent.modifiers=0x%04X (Shift: %s, Control: %s, Alt: %s, "
-         "OS: %s, AltGr: %s, CapsLock: %s, NumLock: %s, ScrollLock: %s)",
+         "Meta: %s, OS: %s, AltGr: %s, "
+         "CapsLock: %s, NumLock: %s, ScrollLock: %s)",
          keymapWrapper, aModifierState, aInputEvent.modifiers,
          GetBoolName(aInputEvent.modifiers & MODIFIER_SHIFT),
          GetBoolName(aInputEvent.modifiers & MODIFIER_CONTROL),
          GetBoolName(aInputEvent.modifiers & MODIFIER_ALT),
+         GetBoolName(aInputEvent.modifiers & MODIFIER_META),
          GetBoolName(aInputEvent.modifiers & MODIFIER_OS),
          GetBoolName(aInputEvent.modifiers & MODIFIER_ALTGRAPH),
          GetBoolName(aInputEvent.modifiers & MODIFIER_CAPSLOCK),
@@ -616,7 +666,17 @@ KeymapWrapper::ComputeDOMKeyCode(const GdkEventKey* aGdkKeyEvent)
         if (GetModifierForGDKKeyval(keyvalWithoutModifier)) {
             keyval = keyvalWithoutModifier;
         }
-        return GetDOMKeyCodeFromKeyPairs(keyval);
+        // Note that the modifier keycode and activating or deactivating
+        // modifier flag may be mismatched, but it's okay.  If a DOM key
+        // event handler is testing a keydown event, it's more likely being
+        // used to test which key is being pressed than to test which
+        // modifier will become active.  So, if we computed DOM keycode
+        // from modifier flag which were changing by the physical key, then
+        // there would be no other way for the user to generate the original
+        // keycode.
+        PRUint32 DOMKeyCode = GetDOMKeyCodeFromKeyPairs(keyval);
+        NS_ASSERTION(DOMKeyCode, "All modifier keys must have a DOM keycode");
+        return DOMKeyCode;
     }
 
     // If the key isn't printable, let's look at the key pairs.

From 588dd9f9f30e71e80f279e112d224f4f2544beac Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 19 Jul 2012 10:28:16 +0900
Subject: [PATCH 096/118] Bug 751749 part.2 Support Win key for a modifier of
 shortcut key and access key r=smaug, enn

---
 accessible/src/generic/Accessible.h           |  1 +
 accessible/src/xul/XULMenuAccessible.cpp      |  9 +++
 content/base/public/nsContentUtils.h          |  2 +
 content/base/src/nsContentUtils.cpp           | 15 +++++
 content/events/src/nsEventStateManager.cpp    |  8 +++
 content/xbl/src/nsXBLPrototypeHandler.cpp     | 60 ++++++++++++-------
 content/xbl/src/nsXBLPrototypeHandler.h       |  7 ++-
 layout/xul/base/src/nsMenuBarListener.cpp     | 27 ++++++---
 layout/xul/base/src/nsMenuFrame.cpp           |  8 +++
 modules/libpref/src/init/all.js               |  4 +-
 toolkit/content/tests/chrome/window_keys.xul  | 12 ++++
 .../mac/platformKeys.properties               |  3 +
 .../unix/platformKeys.properties              |  3 +
 .../win/platformKeys.properties               |  3 +
 widget/gtk2/nsGtkKeyUtils.cpp                 |  8 ++-
 widget/nsGUIEvent.h                           | 11 ++++
 widget/windows/nsWindow.cpp                   |  5 +-
 17 files changed, 145 insertions(+), 41 deletions(-)

diff --git a/accessible/src/generic/Accessible.h b/accessible/src/generic/Accessible.h
index 4cebcf6ad4e..eb2f7ba2c32 100644
--- a/accessible/src/generic/Accessible.h
+++ b/accessible/src/generic/Accessible.h
@@ -918,6 +918,7 @@ public:
   static const PRUint32 kControl = 2;
   static const PRUint32 kAlt = 4;
   static const PRUint32 kMeta = 8;
+  static const PRUint32 kOS = 16;
 
   KeyBinding() : mKey(0), mModifierMask(0) {}
   KeyBinding(PRUint32 aKey, PRUint32 aModifierMask) :
diff --git a/accessible/src/xul/XULMenuAccessible.cpp b/accessible/src/xul/XULMenuAccessible.cpp
index 0df1ac9e8a9..297441d22c9 100644
--- a/accessible/src/xul/XULMenuAccessible.cpp
+++ b/accessible/src/xul/XULMenuAccessible.cpp
@@ -184,6 +184,9 @@ XULMenuitemAccessible::AccessKey() const
         case nsIDOMKeyEvent::DOM_VK_META:
           modifierKey = KeyBinding::kMeta;
           break;
+        case nsIDOMKeyEvent::DOM_VK_WIN:
+          modifierKey = KeyBinding::kOS;
+          break;
       }
     }
   }
@@ -226,6 +229,8 @@ XULMenuitemAccessible::KeyboardShortcut() const
     modifierMask |= KeyBinding::kAlt;
   if (modifiersStr.Find("meta") != -1)
     modifierMask |= KeyBinding::kMeta;
+  if (modifiersStr.Find("os") != -1)
+    modifierMask |= KeyBinding::kOS;
   if (modifiersStr.Find("control") != -1)
     modifierMask |= KeyBinding::kControl;
   if (modifiersStr.Find("accel") != -1) {
@@ -235,6 +240,10 @@ XULMenuitemAccessible::KeyboardShortcut() const
         modifierMask |= KeyBinding::kMeta;
         break;
 
+      case nsIDOMKeyEvent::DOM_VK_WIN:
+        modifierMask |= KeyBinding::kOS;
+        break;
+
       case nsIDOMKeyEvent::DOM_VK_ALT:
         modifierMask |= KeyBinding::kAlt;
         break;
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 4aea5f43851..d43b25f861a 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1870,6 +1870,7 @@ public:
   static void GetShiftText(nsAString& text);
   static void GetControlText(nsAString& text);
   static void GetMetaText(nsAString& text);
+  static void GetOSText(nsAString& text);
   static void GetAltText(nsAString& text);
   static void GetModifierSeparatorText(nsAString& text);
 
@@ -2174,6 +2175,7 @@ private:
   static nsString* sShiftText;
   static nsString* sControlText;
   static nsString* sMetaText;
+  static nsString* sOSText;
   static nsString* sAltText;
   static nsString* sModifierSeparator;
 };
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 5425f0c53a6..6b0264c6b94 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -216,6 +216,7 @@ bool nsContentUtils::sAllowXULXBL_for_file = false;
 nsString* nsContentUtils::sShiftText = nsnull;
 nsString* nsContentUtils::sControlText = nsnull;
 nsString* nsContentUtils::sMetaText = nsnull;
+nsString* nsContentUtils::sOSText = nsnull;
 nsString* nsContentUtils::sAltText = nsnull;
 nsString* nsContentUtils::sModifierSeparator = nsnull;
 
@@ -435,6 +436,15 @@ nsContentUtils::GetMetaText(nsAString& text)
   text.Assign(*sMetaText);
 }
 
+void
+nsContentUtils::GetOSText(nsAString& text)
+{
+  if (!sOSText) {
+    InitializeModifierStrings();
+  }
+  text.Assign(*sOSText);
+}
+
 void
 nsContentUtils::GetAltText(nsAString& text)
 {
@@ -467,6 +477,7 @@ nsContentUtils::InitializeModifierStrings()
   NS_ASSERTION(NS_SUCCEEDED(rv) && bundle, "chrome://global/locale/platformKeys.properties could not be loaded");
   nsXPIDLString shiftModifier;
   nsXPIDLString metaModifier;
+  nsXPIDLString osModifier;
   nsXPIDLString altModifier;
   nsXPIDLString controlModifier;
   nsXPIDLString modifierSeparator;
@@ -474,6 +485,7 @@ nsContentUtils::InitializeModifierStrings()
     //macs use symbols for each modifier key, so fetch each from the bundle, which also covers i18n
     bundle->GetStringFromName(NS_LITERAL_STRING("VK_SHIFT").get(), getter_Copies(shiftModifier));
     bundle->GetStringFromName(NS_LITERAL_STRING("VK_META").get(), getter_Copies(metaModifier));
+    bundle->GetStringFromName(NS_LITERAL_STRING("VK_WIN").get(), getter_Copies(osModifier));
     bundle->GetStringFromName(NS_LITERAL_STRING("VK_ALT").get(), getter_Copies(altModifier));
     bundle->GetStringFromName(NS_LITERAL_STRING("VK_CONTROL").get(), getter_Copies(controlModifier));
     bundle->GetStringFromName(NS_LITERAL_STRING("MODIFIER_SEPARATOR").get(), getter_Copies(modifierSeparator));
@@ -481,6 +493,7 @@ nsContentUtils::InitializeModifierStrings()
   //if any of these don't exist, we get  an empty string
   sShiftText = new nsString(shiftModifier);
   sMetaText = new nsString(metaModifier);
+  sOSText = new nsString(osModifier);
   sAltText = new nsString(altModifier);
   sControlText = new nsString(controlModifier);
   sModifierSeparator = new nsString(modifierSeparator);  
@@ -1453,6 +1466,8 @@ nsContentUtils::Shutdown()
   sControlText = nsnull;
   delete sMetaText;  
   sMetaText = nsnull;
+  delete sOSText;
+  sOSText = nsnull;
   delete sAltText;  
   sAltText = nsnull;
   delete sModifierSeparator;
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 0b25fbd6ea8..6da545829d5 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -266,6 +266,7 @@ enum {
 #define NS_MODIFIER_CONTROL  2
 #define NS_MODIFIER_ALT      4
 #define NS_MODIFIER_META     8
+#define NS_MODIFIER_OS       16
 
 static nsIDocument *
 GetDocumentFromWindow(nsIDOMWindow *aWindow)
@@ -290,6 +291,7 @@ GetAccessModifierMaskFromPref(PRInt32 aItemType)
     case nsIDOMKeyEvent::DOM_VK_CONTROL: return NS_MODIFIER_CONTROL;
     case nsIDOMKeyEvent::DOM_VK_ALT:     return NS_MODIFIER_ALT;
     case nsIDOMKeyEvent::DOM_VK_META:    return NS_MODIFIER_META;
+    case nsIDOMKeyEvent::DOM_VK_WIN:     return NS_MODIFIER_OS;
     default:                             return 0;
   }
 
@@ -1167,6 +1169,8 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
         modifierMask |= NS_MODIFIER_ALT;
       if (keyEvent->IsMeta())
         modifierMask |= NS_MODIFIER_META;
+      if (keyEvent->IsOS())
+        modifierMask |= NS_MODIFIER_OS;
 
       // Prevent keyboard scrolling while an accesskey modifier is in use.
       if (modifierMask && (modifierMask == sChromeAccessModifier ||
@@ -1524,6 +1528,10 @@ nsEventStateManager::GetAccessKeyLabelPrefix(nsAString& aPrefix)
     nsContentUtils::GetMetaText(modifierText);
     aPrefix.Append(modifierText + separator);
   }
+  if (modifier & NS_MODIFIER_OS) {
+    nsContentUtils::GetOSText(modifierText);
+    aPrefix.Append(modifierText + separator);
+  }
   if (modifier & NS_MODIFIER_ALT) {
     nsContentUtils::GetAltText(modifierText);
     aPrefix.Append(modifierText + separator);
diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp
index 9f33b8ade68..82dd32ae054 100644
--- a/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -61,13 +61,16 @@ const PRInt32 nsXBLPrototypeHandler::cShift = (1<<0);
 const PRInt32 nsXBLPrototypeHandler::cAlt = (1<<1);
 const PRInt32 nsXBLPrototypeHandler::cControl = (1<<2);
 const PRInt32 nsXBLPrototypeHandler::cMeta = (1<<3);
+const PRInt32 nsXBLPrototypeHandler::cOS = (1<<4);
 
-const PRInt32 nsXBLPrototypeHandler::cShiftMask = (1<<4);
-const PRInt32 nsXBLPrototypeHandler::cAltMask = (1<<5);
-const PRInt32 nsXBLPrototypeHandler::cControlMask = (1<<6);
-const PRInt32 nsXBLPrototypeHandler::cMetaMask = (1<<7);
+const PRInt32 nsXBLPrototypeHandler::cShiftMask = (1<<5);
+const PRInt32 nsXBLPrototypeHandler::cAltMask = (1<<6);
+const PRInt32 nsXBLPrototypeHandler::cControlMask = (1<<7);
+const PRInt32 nsXBLPrototypeHandler::cMetaMask = (1<<8);
+const PRInt32 nsXBLPrototypeHandler::cOSMask = (1<<9);
 
-const PRInt32 nsXBLPrototypeHandler::cAllModifiers = cShiftMask | cAltMask | cControlMask | cMetaMask;
+const PRInt32 nsXBLPrototypeHandler::cAllModifiers =
+  cShiftMask | cAltMask | cControlMask | cMetaMask | cOSMask;
 
 nsXBLPrototypeHandler::nsXBLPrototypeHandler(const PRUnichar* aEvent,
                                              const PRUnichar* aPhase,
@@ -496,6 +499,8 @@ nsXBLPrototypeHandler::DispatchXULKeyCommand(nsIDOMEvent* aEvent)
     return NS_ERROR_FAILURE;
   }
 
+  // XXX We should use widget::Modifiers for supporting all modifiers.
+
   bool isAlt = false;
   bool isControl = false;
   bool isShift = false;
@@ -646,11 +651,12 @@ PRInt32 nsXBLPrototypeHandler::KeyToMask(PRInt32 key)
   {
     case nsIDOMKeyEvent::DOM_VK_META:
       return cMeta | cMetaMask;
-      break;
+
+    case nsIDOMKeyEvent::DOM_VK_WIN:
+      return cOS | cOSMask;
 
     case nsIDOMKeyEvent::DOM_VK_ALT:
       return cAlt | cAltMask;
-      break;
 
     case nsIDOMKeyEvent::DOM_VK_CONTROL:
     default:
@@ -757,6 +763,8 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
         mKeyMask |= cAlt | cAltMask;
       else if (PL_strcmp(token, "meta") == 0)
         mKeyMask |= cMeta | cMetaMask;
+      else if (PL_strcmp(token, "os") == 0)
+        mKeyMask |= cOS | cOSMask;
       else if (PL_strcmp(token, "control") == 0)
         mKeyMask |= cControl | cControlMask;
       else if (PL_strcmp(token, "accel") == 0)
@@ -764,7 +772,7 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement,
       else if (PL_strcmp(token, "access") == 0)
         mKeyMask |= KeyToMask(kMenuAccessKey);
       else if (PL_strcmp(token, "any") == 0)
-        mKeyMask &= ~(mKeyMask << 4);
+        mKeyMask &= ~(mKeyMask << 5);
     
       token = nsCRT::strtok( newStr, ", \t", &newStr );
     }
@@ -853,32 +861,38 @@ bool
 nsXBLPrototypeHandler::ModifiersMatchMask(nsIDOMUIEvent* aEvent,
                                           bool aIgnoreShiftKey)
 {
-  nsCOMPtr<nsIDOMKeyEvent> key(do_QueryInterface(aEvent));
-  nsCOMPtr<nsIDOMMouseEvent> mouse(do_QueryInterface(aEvent));
+  nsEvent* event = aEvent->GetInternalNSEvent();
+  NS_ENSURE_TRUE(event && NS_IS_INPUT_EVENT(event), false);
+  nsInputEvent* inputEvent = static_cast<nsInputEvent*>(event);
 
-  bool keyPresent;
   if (mKeyMask & cMetaMask) {
-    key ? key->GetMetaKey(&keyPresent) : mouse->GetMetaKey(&keyPresent);
-    if (keyPresent != ((mKeyMask & cMeta) != 0))
+    if (inputEvent->IsMeta() != ((mKeyMask & cMeta) != 0)) {
       return false;
+    }
+  }
+
+  if (mKeyMask & cOSMask) {
+    if (inputEvent->IsOS() != ((mKeyMask & cOS) != 0)) {
+      return false;
+    }
   }
 
   if (mKeyMask & cShiftMask && !aIgnoreShiftKey) {
-    key ? key->GetShiftKey(&keyPresent) : mouse->GetShiftKey(&keyPresent);
-    if (keyPresent != ((mKeyMask & cShift) != 0))
+    if (inputEvent->IsShift() != ((mKeyMask & cShift) != 0)) {
       return false;
+    }
   }
 
   if (mKeyMask & cAltMask) {
-    key ? key->GetAltKey(&keyPresent) : mouse->GetAltKey(&keyPresent);
-    if (keyPresent != ((mKeyMask & cAlt) != 0))
+    if (inputEvent->IsAlt() != ((mKeyMask & cAlt) != 0)) {
       return false;
+    }
   }
 
   if (mKeyMask & cControlMask) {
-    key ? key->GetCtrlKey(&keyPresent) : mouse->GetCtrlKey(&keyPresent);
-    if (keyPresent != ((mKeyMask & cControl) != 0))
+    if (inputEvent->IsControl() != ((mKeyMask & cControl) != 0)) {
       return false;
+    }
   }
 
   return true;
@@ -889,13 +903,13 @@ nsXBLPrototypeHandler::Read(nsIScriptContext* aContext, nsIObjectInputStream* aS
 {
   nsresult rv = aStream->Read8(&mPhase);
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = aStream->Read8(&mKeyMask);
-  NS_ENSURE_SUCCESS(rv, rv);
   rv = aStream->Read8(&mType);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = aStream->Read8(&mMisc);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = aStream->Read32(reinterpret_cast<PRUint32*>(&mKeyMask));
+  NS_ENSURE_SUCCESS(rv, rv);
   PRUint32 detail; 
   rv = aStream->Read32(&detail);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -931,12 +945,12 @@ nsXBLPrototypeHandler::Write(nsIScriptContext* aContext, nsIObjectOutputStream*
   nsresult rv = aStream->Write8(type);
   rv = aStream->Write8(mPhase);
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = aStream->Write8(mKeyMask);
-  NS_ENSURE_SUCCESS(rv, rv);
   rv = aStream->Write8(mType);
   NS_ENSURE_SUCCESS(rv, rv);
   rv = aStream->Write8(mMisc);
   NS_ENSURE_SUCCESS(rv, rv);
+  rv = aStream->Write32(static_cast<PRUint32>(mKeyMask));
+  NS_ENSURE_SUCCESS(rv, rv);
   rv = aStream->Write32(mDetail);
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/content/xbl/src/nsXBLPrototypeHandler.h b/content/xbl/src/nsXBLPrototypeHandler.h
index 18a171cf448..8c4a13cd906 100644
--- a/content/xbl/src/nsXBLPrototypeHandler.h
+++ b/content/xbl/src/nsXBLPrototypeHandler.h
@@ -172,11 +172,13 @@ protected:
   static const PRInt32 cAlt;
   static const PRInt32 cControl;
   static const PRInt32 cMeta;
+  static const PRInt32 cOS;
 
   static const PRInt32 cShiftMask;
   static const PRInt32 cAltMask;
   static const PRInt32 cControlMask;
   static const PRInt32 cMetaMask;
+  static const PRInt32 cOSMask;
 
   static const PRInt32 cAllModifiers;
 
@@ -193,8 +195,6 @@ protected:
   
   // The following four values make up 32 bits.
   PRUint8 mPhase;            // The phase (capturing, bubbling)
-  PRUint8 mKeyMask;          // Which modifier keys this event handler expects to have down
-                             // in order to be matched.
   PRUint8 mType;             // The type of the handler.  The handler is either a XUL key
                              // handler, an XBL "command" event, or a normal XBL event with
                              // accompanying JavaScript.  The high bit is used to indicate
@@ -203,6 +203,9 @@ protected:
                              // stores whether or not we're a key code or char code.
                              // For mouse events, stores the clickCount.
 
+  PRInt32 mKeyMask;          // Which modifier keys this event handler expects to have down
+                             // in order to be matched.
+ 
   // The primary filter information for mouse/key events.
   PRInt32 mDetail;           // For key events, contains a charcode or keycode. For
                              // mouse events, stores the button info.
diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp
index 306f6414513..7f123a2ba3d 100644
--- a/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/layout/xul/base/src/nsMenuBarListener.cpp
@@ -33,6 +33,7 @@ NS_IMPL_ISUPPORTS1(nsMenuBarListener, nsIDOMEventListener)
 #define MODIFIER_CONTROL  2
 #define MODIFIER_ALT      4
 #define MODIFIER_META     8
+#define MODIFIER_OS       16
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -86,6 +87,8 @@ void nsMenuBarListener::InitAccessKey()
     mAccessKeyMask = MODIFIER_ALT;
   else if (mAccessKey == nsIDOMKeyEvent::DOM_VK_META)
     mAccessKeyMask = MODIFIER_META;
+  else if (mAccessKey == nsIDOMKeyEvent::DOM_VK_WIN)
+    mAccessKeyMask = MODIFIER_OS;
 
   mAccessKeyFocuses = Preferences::GetBool("ui.key.menuAccessKeyFocuses");
 }
@@ -270,23 +273,29 @@ PRUint32
 nsMenuBarListener::GetModifiers(nsIDOMKeyEvent* aKeyEvent)
 {
   PRUint32 modifiers = 0;
-  bool modifier;
+  nsInputEvent* inputEvent =
+    static_cast<nsInputEvent*>(aKeyEvent->GetInternalNSEvent());
+  MOZ_ASSERT(inputEvent);
 
-  aKeyEvent->GetShiftKey(&modifier);
-  if (modifier)
+  if (inputEvent->IsShift()) {
     modifiers |= MODIFIER_SHIFT;
+  }
 
-  aKeyEvent->GetCtrlKey(&modifier);
-  if (modifier)
+  if (inputEvent->IsControl()) {
     modifiers |= MODIFIER_CONTROL;
+  }
 
-  aKeyEvent->GetAltKey(&modifier);
-  if (modifier)
+  if (inputEvent->IsAlt()) {
     modifiers |= MODIFIER_ALT;
+  }
 
-  aKeyEvent->GetMetaKey(&modifier);
-  if (modifier)
+  if (inputEvent->IsMeta()) {
     modifiers |= MODIFIER_META;
+  }
+
+  if (inputEvent->IsOS()) {
+    modifiers |= MODIFIER_OS;
+  }
 
   return modifiers;
 }
diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp
index 6fa78c670c3..2e896461887 100644
--- a/layout/xul/base/src/nsMenuFrame.cpp
+++ b/layout/xul/base/src/nsMenuFrame.cpp
@@ -1094,12 +1094,14 @@ nsMenuFrame::BuildAcceleratorText(bool aNotify)
   nsAutoString altText;
   nsAutoString metaText;
   nsAutoString controlText;
+  nsAutoString osText;
   nsAutoString modifierSeparator;
 
   nsContentUtils::GetShiftText(shiftText);
   nsContentUtils::GetAltText(altText);
   nsContentUtils::GetMetaText(metaText);
   nsContentUtils::GetControlText(controlText);
+  nsContentUtils::GetOSText(osText);
   nsContentUtils::GetModifierSeparatorText(modifierSeparator);
 
   while (token) {
@@ -1110,6 +1112,8 @@ nsMenuFrame::BuildAcceleratorText(bool aNotify)
       accelText += altText; 
     else if (PL_strcmp(token, "meta") == 0) 
       accelText += metaText; 
+    else if (PL_strcmp(token, "os") == 0)
+      accelText += osText; 
     else if (PL_strcmp(token, "control") == 0) 
       accelText += controlText; 
     else if (PL_strcmp(token, "accel") == 0) {
@@ -1119,6 +1123,10 @@ nsMenuFrame::BuildAcceleratorText(bool aNotify)
           accelText += metaText;
           break;
 
+        case nsIDOMKeyEvent::DOM_VK_WIN:
+          accelText += osText;
+          break;
+
         case nsIDOMKeyEvent::DOM_VK_ALT:
           accelText += altText;
           break;
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index f442df4eb01..10a85fd6377 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1317,13 +1317,13 @@ pref("security.csp.debug", false);
 
 // Modifier key prefs: default to Windows settings,
 // menu access key = alt, accelerator key = control.
-// Use 17 for Ctrl, 18 for Alt, 224 for Meta, 0 for none. Mac settings in macprefs.js
+// Use 17 for Ctrl, 18 for Alt, 224 for Meta, 91 for Win, 0 for none. Mac settings in macprefs.js
 pref("ui.key.accelKey", 17);
 pref("ui.key.menuAccessKey", 18);
 pref("ui.key.generalAccessKey", -1);
 
 // If generalAccessKey is -1, use the following two prefs instead.
-// Use 0 for disabled, 1 for Shift, 2 for Ctrl, 4 for Alt, 8 for Meta
+// Use 0 for disabled, 1 for Shift, 2 for Ctrl, 4 for Alt, 8 for Meta, 16 for Win
 // (values can be combined, e.g. 5 for Alt+Shift)
 pref("ui.key.chromeAccess", 4);
 pref("ui.key.contentAccess", 5);
diff --git a/toolkit/content/tests/chrome/window_keys.xul b/toolkit/content/tests/chrome/window_keys.xul
index 6c794308c48..b70be890c2b 100644
--- a/toolkit/content/tests/chrome/window_keys.xul
+++ b/toolkit/content/tests/chrome/window_keys.xul
@@ -23,6 +23,7 @@ var keysToTest = [
   ["k-v-scy", "V", { ctrlKey: true } ],
   ["", "V", { altKey: true } ],
   ["", "V", { metaKey: true } ],
+  ["", "V", { osKey: true } ],
   ["k-v-scy", "V", { shiftKey: true, ctrlKey: true } ],
   ["", "V", { shiftKey: true, ctrlKey: true, altKey: true } ],
   ["k-e-y", "E", { } ],
@@ -30,8 +31,16 @@ var keysToTest = [
   ["", "E", { ctrlKey: true } ],
   ["", "E", { altKey: true } ],
   ["", "E", { metaKey: true } ],
+  ["", "E", { osKey: true } ],
   ["k-d-a", "D", { altKey: true } ],
   ["k-8-m", "8", { metaKey: true } ],
+  ["", "8", { metaKey: true, osKey: true } ],
+  ["k-a-o", "A", { osKey: true } ],
+  ["", "A", { osKey: true, metaKey: true } ],
+  ["k-b-myo", "B", { osKey: true } ],
+  ["k-b-myo", "B", { osKey: true, metaKey: true } ],
+  ["k-f-oym", "F", { metaKey: true } ],
+  ["k-f-oym", "F", { metaKey: true, osKey: true } ],
   ["k-c-scaym", "C", { metaKey: true } ],
   ["k-c-scaym", "C", { shiftKey: true, ctrlKey: true, altKey: true, metaKey: true } ],
   ["", "V", { shiftKey: true, ctrlKey: true, altKey: true } ],
@@ -148,6 +157,9 @@ SimpleTest.waitForFocus(runTest);
   <key id="k-v-scy" key="v" modifiers="shift any control" oncommand="checkKey(event)"/>
   <key id="k-e-y" key="e" modifiers="any" oncommand="checkKey(event)"/>
   <key id="k-8-m" key="8" modifiers="meta" oncommand="checkKey(event)"/>
+  <key id="k-a-o" key="a" modifiers="os" oncommand="checkKey(event)"/>
+  <key id="k-b-myo" key="b" modifiers="meta any os" oncommand="checkKey(event)"/>
+  <key id="k-f-oym" key="f" modifiers="os any meta" oncommand="checkKey(event)"/>
   <key id="k-c-scaym" key="c" modifiers="shift control alt any meta" oncommand="checkKey(event)"/>
   <key id="k-h-l" key="h" modifiers="accel" oncommand="checkKey(event)"/>
   <key id="k-j-s" key="j" modifiers="access" oncommand="checkKey(event)"/>
diff --git a/toolkit/locales/en-US/chrome/global-platform/mac/platformKeys.properties b/toolkit/locales/en-US/chrome/global-platform/mac/platformKeys.properties
index d87af303cb3..39f3d62e830 100644
--- a/toolkit/locales/en-US/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/mac/platformKeys.properties
@@ -12,6 +12,9 @@ VK_SHIFT=\u21e7
 #the command key - clover leaf symbol (ctrl-q)
 VK_META=\u2318
 
+#the win key - never generated by native key event
+VK_WIN=win
+
 #the option/alt key - splitting tracks symbol (ctrl-g)
 VK_ALT=\u2325
 
diff --git a/toolkit/locales/en-US/chrome/global-platform/unix/platformKeys.properties b/toolkit/locales/en-US/chrome/global-platform/unix/platformKeys.properties
index e186a5976dd..53321356e0b 100644
--- a/toolkit/locales/en-US/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/unix/platformKeys.properties
@@ -12,6 +12,9 @@ VK_SHIFT=Shift
 #the command key
 VK_META=Meta
 
+#the win key (Super key and Hyper keys are mapped to DOM Win key)
+VK_WIN=Win
+
 #the alt key
 VK_ALT=Alt
 
diff --git a/toolkit/locales/en-US/chrome/global-platform/win/platformKeys.properties b/toolkit/locales/en-US/chrome/global-platform/win/platformKeys.properties
index e186a5976dd..307eeaf195c 100644
--- a/toolkit/locales/en-US/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/locales/en-US/chrome/global-platform/win/platformKeys.properties
@@ -12,6 +12,9 @@ VK_SHIFT=Shift
 #the command key
 VK_META=Meta
 
+#the win key
+VK_WIN=Win
+
 #the alt key
 VK_ALT=Alt
 
diff --git a/widget/gtk2/nsGtkKeyUtils.cpp b/widget/gtk2/nsGtkKeyUtils.cpp
index 41e3571c7f5..44446d969e4 100644
--- a/widget/gtk2/nsGtkKeyUtils.cpp
+++ b/widget/gtk2/nsGtkKeyUtils.cpp
@@ -1186,9 +1186,11 @@ KeymapWrapper::InitKeypressEvent(nsKeyEvent& aKeyEvent,
     // If the event causes inputting a character, keyCode must be zero.
     aKeyEvent.keyCode = 0;
 
-    // If Ctrl or Alt or Meta is pressed, we need to append the key details
-    // for handling shortcut key.  Otherwise, we have no additional work.
-    if (!aKeyEvent.IsControl() && !aKeyEvent.IsAlt() && !aKeyEvent.IsMeta()) {
+    // If Ctrl or Alt or Meta or OS is pressed, we need to append the key
+    // details for handling shortcut key.  Otherwise, we have no additional
+    // work.
+    if (!aKeyEvent.IsControl() && !aKeyEvent.IsAlt() &&
+        !aKeyEvent.IsMeta() && !aKeyEvent.IsOS()) {
         PR_LOG(gKeymapWrapperLog, PR_LOG_ALWAYS,
             ("KeymapWrapper(%p): InitKeypressEvent, "
              "keyCode=0x%02X, charCode=0x%08X",
diff --git a/widget/nsGUIEvent.h b/widget/nsGUIEvent.h
index 4890235c7d7..397b1489e9f 100644
--- a/widget/nsGUIEvent.h
+++ b/widget/nsGUIEvent.h
@@ -1802,6 +1802,17 @@ enum nsDragDropEventStatus {
   nsDragDropEventStatus_eDrop  
 };
 
+#define NS_IS_INPUT_EVENT(evnt) \
+       (((evnt)->eventStructType == NS_INPUT_EVENT) || \
+        ((evnt)->eventStructType == NS_ACCESSIBLE_EVENT) || \
+        ((evnt)->eventStructType == NS_MOUSE_EVENT) || \
+        ((evnt)->eventStructType == NS_KEY_EVENT) || \
+        ((evnt)->eventStructType == NS_TEXT_EVENT) || \
+        ((evnt)->eventStructType == NS_TOUCH_EVENT) || \
+        ((evnt)->eventStructType == NS_DRAG_EVENT) || \
+        ((evnt)->eventStructType == NS_MOUSE_SCROLL_EVENT) || \
+        ((evnt)->eventStructType == NS_MOZTOUCH_EVENT) || \
+        ((evnt)->eventStructType == NS_SIMPLE_GESTURE_EVENT))
 
 #define NS_IS_MOUSE_EVENT(evnt) \
        (((evnt)->message == NS_MOUSE_BUTTON_DOWN) || \
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index 8b3955e078a..18e67b0b27a 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -6383,7 +6383,7 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
   // Enter and backspace are always handled here to avoid for example the
   // confusion between ctrl-enter and ctrl-J.
   if (DOMKeyCode == NS_VK_RETURN || DOMKeyCode == NS_VK_BACK ||
-      ((aModKeyState.IsControl() || aModKeyState.IsAlt())
+      ((aModKeyState.IsControl() || aModKeyState.IsAlt() || aModKeyState.IsWin())
        && !isDeadKey && KeyboardLayout::IsPrintableCharKey(virtualKeyCode)))
   {
     // Remove a possible WM_CHAR or WM_SYSCHAR messages from the message queue.
@@ -6472,7 +6472,8 @@ LRESULT nsWindow::OnKeyDown(const MSG &aMsg,
     return result;
   }
   else if (!aModKeyState.IsControl() && !aModKeyState.IsAlt() &&
-           KeyboardLayout::IsPrintableCharKey(virtualKeyCode)) {
+            !aModKeyState.IsWin() &&
+            KeyboardLayout::IsPrintableCharKey(virtualKeyCode)) {
     // If this is simple KeyDown event but next message is not WM_CHAR,
     // this event may not input text, so we should ignore this event.
     // See bug 314130.

From e947c93f9f0c9f372229032fe546c044e8265ac6 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 19 Jul 2012 10:28:17 +0900
Subject: [PATCH 097/118] Bug 751749 part.3 Editor should handle Win key as a
 modifier key r=ehsan

---
 editor/libeditor/base/nsEditor.cpp            |  6 +-
 editor/libeditor/html/nsHTMLEditor.cpp        |  8 ++-
 .../test_htmleditor_keyevent_handling.html    | 67 +++++++++++++++++++
 editor/libeditor/text/nsPlaintextEditor.cpp   | 10 ++-
 .../test_texteditor_keyevent_handling.html    | 34 ++++++++++
 5 files changed, 117 insertions(+), 8 deletions(-)

diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp
index 2f07167d669..20d8f9982cd 100644
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -5005,6 +5005,7 @@ nsEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
 
   switch (nativeKeyEvent->keyCode) {
     case nsIDOMKeyEvent::DOM_VK_META:
+    case nsIDOMKeyEvent::DOM_VK_WIN:
     case nsIDOMKeyEvent::DOM_VK_SHIFT:
     case nsIDOMKeyEvent::DOM_VK_CONTROL:
     case nsIDOMKeyEvent::DOM_VK_ALT:
@@ -5012,7 +5013,7 @@ nsEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
       return NS_OK;
     case nsIDOMKeyEvent::DOM_VK_BACK_SPACE:
       if (nativeKeyEvent->IsControl() || nativeKeyEvent->IsAlt() ||
-          nativeKeyEvent->IsMeta()) {
+          nativeKeyEvent->IsMeta() || nativeKeyEvent->IsOS()) {
         return NS_OK;
       }
       DeleteSelection(nsIEditor::ePrevious, nsIEditor::eStrip);
@@ -5023,7 +5024,8 @@ nsEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
       // modifies what delete does (cmd_cut in this case).
       // bailing here to allow the keybindings to do the cut.
       if (nativeKeyEvent->IsShift() || nativeKeyEvent->IsControl() ||
-          nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta()) {
+          nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta() ||
+          nativeKeyEvent->IsOS()) {
         return NS_OK;
       }
       DeleteSelection(nsIEditor::eNext, nsIEditor::eStrip);
diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index fb80750f9c0..d21443d13b4 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -599,6 +599,7 @@ nsHTMLEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
 
   switch (nativeKeyEvent->keyCode) {
     case nsIDOMKeyEvent::DOM_VK_META:
+    case nsIDOMKeyEvent::DOM_VK_WIN:
     case nsIDOMKeyEvent::DOM_VK_SHIFT:
     case nsIDOMKeyEvent::DOM_VK_CONTROL:
     case nsIDOMKeyEvent::DOM_VK_ALT:
@@ -619,7 +620,7 @@ nsHTMLEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
       }
 
       if (nativeKeyEvent->IsControl() || nativeKeyEvent->IsAlt() ||
-          nativeKeyEvent->IsMeta()) {
+          nativeKeyEvent->IsMeta() || nativeKeyEvent->IsOS()) {
         return NS_OK;
       }
 
@@ -669,7 +670,7 @@ nsHTMLEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
     case nsIDOMKeyEvent::DOM_VK_RETURN:
     case nsIDOMKeyEvent::DOM_VK_ENTER:
       if (nativeKeyEvent->IsControl() || nativeKeyEvent->IsAlt() ||
-          nativeKeyEvent->IsMeta()) {
+          nativeKeyEvent->IsMeta() || nativeKeyEvent->IsOS()) {
         return NS_OK;
       }
       aKeyEvent->PreventDefault(); // consumed
@@ -684,7 +685,8 @@ nsHTMLEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
   // NOTE: On some keyboard layout, some characters are inputted with Control
   // key or Alt key, but at that time, widget sets FALSE to these keys.
   if (nativeKeyEvent->charCode == 0 || nativeKeyEvent->IsControl() ||
-      nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta()) {
+      nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta() ||
+      nativeKeyEvent->IsOS()) {
     // we don't PreventDefault() here or keybindings like control-x won't work
     return NS_OK;
   }
diff --git a/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html b/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html
index ae04b6d5ab7..f113460bcae 100644
--- a/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html
+++ b/editor/libeditor/html/tests/test_htmleditor_keyevent_handling.html
@@ -136,6 +136,10 @@ function runTests()
     synthesizeKey("VK_META", { type: "keypress" });
     check(aDescription + "Meta", true, true, !aIsReadonly);
 
+    reset("");
+    synthesizeKey("VK_WIN", { type: "keypress" });
+    check(aDescription + "OS", true, true, !aIsReadonly);
+
     reset("");
     synthesizeKey("VK_SHIFT", { type: "keypress" });
     check(aDescription + "Shift", true, true, !aIsReadonly);
@@ -176,6 +180,10 @@ function runTests()
     synthesizeKey("VK_BACK_SPACE", { metaKey: true });
     check(aDescription + "Meta+Backspace", true, true, aIsReadonly);
 
+    reset("");
+    synthesizeKey("VK_BACK_SPACE", { osKey: true });
+    check(aDescription + "OS+Backspace", true, true, aIsReadonly);
+
     // Delete key:
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable, delete is consumed.
@@ -200,6 +208,10 @@ function runTests()
     synthesizeKey("VK_DELETE", { metaKey: true });
     check(aDescription + "Meta+Delete", true, true, false);
 
+    reset("");
+    synthesizeKey("VK_DELETE", { osKey: true });
+    check(aDescription + "OS+Delete", true, true, false);
+
     // Return key:
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable and not single line editor, it consumes Return
@@ -234,6 +246,11 @@ function runTests()
     check(aDescription + "Meta+Return", true, true, false);
     is(aElement.innerHTML, "a", aDescription + "Meta+Return");
 
+    reset("a");
+    synthesizeKey("VK_RETURN", { osKey: true });
+    check(aDescription + "OS+Return", true, true, false);
+    is(aElement.innerHTML, "a", aDescription + "OS+Return");
+
     // Enter key (same as Return key):
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable and not single line editor, it consumes Return
@@ -268,6 +285,11 @@ function runTests()
     check(aDescription + "Meta+Enter", true, true, false);
     is(aElement.innerHTML, "a", aDescription + "Meta+Enter");
 
+    reset("a");
+    synthesizeKey("VK_ENTER", { osKey: true });
+    check(aDescription + "OS+Enter", true, true, false);
+    is(aElement.innerHTML, "a", aDescription + "OS+Enter");
+
     // Tab key:
     //   If editor is tabbable, editor doesn't consume all tab key events.
     //   Otherwise, editor consumes tab key event without any modifier keys.
@@ -311,6 +333,13 @@ function runTests()
     is(fm.focusedElement, aElement,
        aDescription + "focus moved unexpectedly (Meta+Tab)");
 
+    reset("a");
+    synthesizeKey("VK_TAB", { osKey: true });
+    check(aDescription + "OS+Tab", true, true, false);
+    is(aElement.innerHTML, "a", aDescription + "OS+Tab");
+    is(fm.focusedElement, aElement,
+       aDescription + "focus moved unexpectedly (OS+Tab)");
+
     // Indent/Outdent tests:
     // UL
     resetForIndent("<ul><li id=\"target\">ul list item</li></ul>");
@@ -372,6 +401,14 @@ function runTests()
     is(fm.focusedElement, aElement,
        aDescription + "focus moved unexpectedly (Meta+Tab on UL)");
 
+    resetForIndent("<ul><li id=\"target\">ul list item</li></ul>");
+    synthesizeKey("VK_TAB", { osKey: true });
+    check(aDescription + "OS+Tab on UL", true, true, false);
+    is(aElement.innerHTML, "<ul><li id=\"target\">ul list item</li></ul>",
+       aDescription + "OS+Tab on UL");
+    is(fm.focusedElement, aElement,
+       aDescription + "focus moved unexpectedly (OS+Tab on UL)");
+
     // OL
     resetForIndent("<ol><li id=\"target\">ol list item</li></ol>");
     synthesizeKey("VK_TAB", { });
@@ -432,6 +469,14 @@ function runTests()
     is(fm.focusedElement, aElement,
        aDescription + "focus moved unexpectedly (Meta+Tab on OL)");
 
+    resetForIndent("<ol><li id=\"target\">ol list item</li></ol>");
+    synthesizeKey("VK_TAB", { osKey: true });
+    check(aDescription + "OS+Tab on OL", true, true, false);
+    is(aElement.innerHTML, "<ol><li id=\"target\">ol list item</li></ol>",
+       aDescription + "OS+Tab on OL");
+    is(fm.focusedElement, aElement,
+       aDescription + "focus moved unexpectedly (OS+Tab on OL)");
+
     // TD
     resetForIndent("<table><tr><td id=\"target\">td</td></tr></table>");
     synthesizeKey("VK_TAB", { });
@@ -494,6 +539,15 @@ function runTests()
     is(fm.focusedElement, aElement,
        aDescription + "focus moved unexpectedly (Meta+Tab on TD)");
 
+    resetForIndent("<table><tr><td id=\"target\">td</td></tr></table>");
+    synthesizeKey("VK_TAB", { osKey: true });
+    check(aDescription + "OS+Tab on TD", true, true, false);
+    is(aElement.innerHTML,
+       "<table><tbody><tr><td id=\"target\">td</td></tr></tbody></table>",
+       aDescription + "OS+Tab on TD");
+    is(fm.focusedElement, aElement,
+       aDescription + "focus moved unexpectedly (OS+Tab on TD)");
+
     // TH
     resetForIndent("<table><tr><th id=\"target\">th</th></tr></table>");
     synthesizeKey("VK_TAB", { });
@@ -556,6 +610,15 @@ function runTests()
     is(fm.focusedElement, aElement,
        aDescription + "focus moved unexpectedly (Meta+Tab on TH)");
 
+    resetForIndent("<table><tr><th id=\"target\">th</th></tr></table>");
+    synthesizeKey("VK_TAB", { osKey: true });
+    check(aDescription + "OS+Tab on TH", true, true, false);
+    is(aElement.innerHTML,
+       "<table><tbody><tr><th id=\"target\">th</th></tr></tbody></table>",
+       aDescription + "OS+Tab on TH");
+    is(fm.focusedElement, aElement,
+       aDescription + "focus moved unexpectedly (OS+Tab on TH)");
+
     // Esc key:
     //   In all cases, esc key events are not consumed
     reset("abc");
@@ -578,6 +641,10 @@ function runTests()
     synthesizeKey("VK_ESCAPE", { metaKey: true });
     check(aDescription + "Meta+Esc", true, true, false);
 
+    reset("abc");
+    synthesizeKey("VK_ESCAPE", { osKey: true });
+    check(aDescription + "OS+Esc", true, true, false);
+
     // typical typing tests:
     reset("");
     synthesizeKey("M", { shiftKey: true });
diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp
index 7416625a911..1f5e8023c69 100644
--- a/editor/libeditor/text/nsPlaintextEditor.cpp
+++ b/editor/libeditor/text/nsPlaintextEditor.cpp
@@ -358,6 +358,7 @@ nsPlaintextEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
 
   switch (nativeKeyEvent->keyCode) {
     case nsIDOMKeyEvent::DOM_VK_META:
+    case nsIDOMKeyEvent::DOM_VK_WIN:
     case nsIDOMKeyEvent::DOM_VK_SHIFT:
     case nsIDOMKeyEvent::DOM_VK_CONTROL:
     case nsIDOMKeyEvent::DOM_VK_ALT:
@@ -371,7 +372,8 @@ nsPlaintextEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
       }
 
       if (nativeKeyEvent->IsShift() || nativeKeyEvent->IsControl() ||
-          nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta()) {
+          nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta() ||
+          nativeKeyEvent->IsOS()) {
         return NS_OK;
       }
 
@@ -382,7 +384,8 @@ nsPlaintextEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
     case nsIDOMKeyEvent::DOM_VK_RETURN:
     case nsIDOMKeyEvent::DOM_VK_ENTER:
       if (IsSingleLineEditor() || nativeKeyEvent->IsControl() ||
-          nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta()) {
+          nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta() ||
+          nativeKeyEvent->IsOS()) {
         return NS_OK;
       }
       aKeyEvent->PreventDefault();
@@ -392,7 +395,8 @@ nsPlaintextEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent)
   // NOTE: On some keyboard layout, some characters are inputted with Control
   // key or Alt key, but at that time, widget sets FALSE to these keys.
   if (nativeKeyEvent->charCode == 0 || nativeKeyEvent->IsControl() ||
-      nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta()) {
+      nativeKeyEvent->IsAlt() || nativeKeyEvent->IsMeta() ||
+      nativeKeyEvent->IsOS()) {
     // we don't PreventDefault() here or keybindings like control-x won't work
     return NS_OK;
   }
diff --git a/editor/libeditor/text/tests/test_texteditor_keyevent_handling.html b/editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
index 4771b080cd0..3de76db4a3d 100644
--- a/editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
+++ b/editor/libeditor/text/tests/test_texteditor_keyevent_handling.html
@@ -123,6 +123,10 @@ function runTests()
     synthesizeKey("VK_META", { type: "keypress" });
     check(aDescription + "Meta", true, true, !aIsReadonly);
 
+    reset("");
+    synthesizeKey("VK_WIN", { type: "keypress" });
+    check(aDescription + "OS", true, true, !aIsReadonly);
+
     reset("");
     synthesizeKey("VK_SHIFT", { type: "keypress" });
     check(aDescription + "Shift", true, true, !aIsReadonly);
@@ -169,6 +173,10 @@ function runTests()
     synthesizeKey("VK_BACK_SPACE", { metaKey: true });
     check(aDescription + "Meta+Backspace", true, true, aIsReadonly);
 
+    reset("");
+    synthesizeKey("VK_BACK_SPACE", { osKey: true });
+    check(aDescription + "OS+Backspace", true, true, aIsReadonly);
+
     // Delete key:
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable, delete is consumed.
@@ -206,6 +214,11 @@ function runTests()
     check(aDescription + "Meta+Delete",
           true, true, kIsLinux);
 
+    reset("");
+    synthesizeKey("VK_DELETE", { osKey: true });
+    check(aDescription + "OS+Delete",
+          true, true, false);
+
     // XXX input.value returns "\n" when it's empty, so, we should use dummy
     // value ("a") for the following tests.
 
@@ -243,6 +256,11 @@ function runTests()
     check(aDescription + "Meta+Return", true, true, false);
     is(aElement.value, "a", aDescription + "Meta+Return");
 
+    reset("a");
+    synthesizeKey("VK_RETURN", { osKey: true });
+    check(aDescription + "OS+Return", true, true, false);
+    is(aElement.value, "a", aDescription + "OS+Return");
+
     // Enter key (same as Return key):
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable and not single line editor, it consumes Return
@@ -277,6 +295,11 @@ function runTests()
     check(aDescription + "Meta+Enter", true, true, false);
     is(aElement.value, "a", aDescription + "Meta+Enter");
 
+    reset("a");
+    synthesizeKey("VK_ENTER", { osKey: true });
+    check(aDescription + "OS+Enter", true, true, false);
+    is(aElement.value, "a", aDescription + "OS+Enter");
+
     // Tab key:
     //   If editor is tabbable, editor doesn't consume all tab key events.
     //   Otherwise, editor consumes tab key event without any modifier keys.
@@ -330,6 +353,13 @@ function runTests()
     is(fm.focusedElement, aElement,
        aDescription + "focus moved unexpectedly (Meta+Tab)");
 
+    reset("a");
+    synthesizeKey("VK_TAB", { osKey: true });
+    check(aDescription + "OS+Tab", true, true, false);
+    is(aElement.value, "a", aDescription + "OS+Tab");
+    is(fm.focusedElement, aElement,
+       aDescription + "focus moved unexpectedly (OS+Tab)");
+
     // Esc key:
     //   In all cases, esc key events are not consumed
     reset("abc");
@@ -352,6 +382,10 @@ function runTests()
     synthesizeKey("VK_ESCAPE", { metaKey: true });
     check(aDescription + "Meta+Esc", true, true, false);
 
+    reset("abc");
+    synthesizeKey("VK_ESCAPE", { osKey: true });
+    check(aDescription + "OS+Esc", true, true, false);
+
     // typical typing tests:
     reset("");
     synthesizeKey("M", { shiftKey: true });

From 94a89956d708c3fef470e0285ac0d8a589aa65d7 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 19 Jul 2012 10:28:17 +0900
Subject: [PATCH 098/118] Bug 751749 part.4 Give higher priority to Meta than
 Super and Hyper due to better compatibility with Web applications r=karlt

---
 widget/gtk2/nsGtkKeyUtils.cpp | 6 +++---
 widget/gtk2/nsGtkKeyUtils.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/widget/gtk2/nsGtkKeyUtils.cpp b/widget/gtk2/nsGtkKeyUtils.cpp
index 44446d969e4..9c76df8b3f2 100644
--- a/widget/gtk2/nsGtkKeyUtils.cpp
+++ b/widget/gtk2/nsGtkKeyUtils.cpp
@@ -463,15 +463,15 @@ KeymapWrapper::InitBySystemSettings()
             case INDEX_ALT:
                 modifier = ALT;
                 break;
+            case INDEX_META:
+                modifier = META;
+                break;
             case INDEX_SUPER:
                 modifier = SUPER;
                 break;
             case INDEX_HYPER:
                 modifier = HYPER;
                 break;
-            case INDEX_META:
-                modifier = META;
-                break;
             case INDEX_ALTGR:
                 modifier = ALTGR;
                 break;
diff --git a/widget/gtk2/nsGtkKeyUtils.h b/widget/gtk2/nsGtkKeyUtils.h
index bda999a5ca8..034703d4eb0 100644
--- a/widget/gtk2/nsGtkKeyUtils.h
+++ b/widget/gtk2/nsGtkKeyUtils.h
@@ -53,9 +53,9 @@ public:
         SHIFT              = 0x0008,
         CTRL               = 0x0010,
         ALT                = 0x0020,
-        SUPER              = 0x0040,
-        HYPER              = 0x0080,
-        META               = 0x0100,
+        META               = 0x0040,
+        SUPER              = 0x0080,
+        HYPER              = 0x0100,
         ALTGR              = 0x0200
     };
 
@@ -170,9 +170,9 @@ protected:
         INDEX_NUM_LOCK,
         INDEX_SCROLL_LOCK,
         INDEX_ALT,
+        INDEX_META,
         INDEX_SUPER,
         INDEX_HYPER,
-        INDEX_META,
         INDEX_ALTGR,
         COUNT_OF_MODIFIER_INDEX
     };

From 4a788ed927ed117da61dec8e02cfd8120afc4f5a Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 19 Jul 2012 10:28:17 +0900
Subject: [PATCH 099/118] Bug 773651 Guess VK_RCONTROL and VK_RMENU from
 extended key flag on XP and don't trust the scan code of key messages r=jimm

---
 widget/tests/test_keycodes.xul    | 1604 +++++++++++++++--------------
 widget/windows/KeyboardLayout.cpp |  142 ++-
 widget/windows/nsWindow.cpp       |   66 +-
 3 files changed, 1002 insertions(+), 810 deletions(-)

diff --git a/widget/tests/test_keycodes.xul b/widget/tests/test_keycodes.xul
index f947866d875..30b47db4335 100644
--- a/widget/tests/test_keycodes.xul
+++ b/widget/tests/test_keycodes.xul
@@ -159,7 +159,7 @@ function synthesizeKey(aEvent, aFocusElementId)
 function runKeyEventTests()
 {
   const nsIDOMKeyEvent = Components.interfaces.nsIDOMKeyEvent;
-  var eventList, keyDownFlags, keyUpFlags, testingEvent;
+  var eventList, keyDownFlags, keyUpFlags, testingEvent, expectedDOMKeyCode;
   const kShiftFlag    = 0x1;
   const kCtrlFlag     = 0x2;
   const kAltFlag      = 0x4;
@@ -197,37 +197,37 @@ function runKeyEventTests()
           is(e.metaKey, (flags & kMetaFlag) != 0, name + ", Command of Shift " + e.type + " event mismatch");
           is(e.altKey, (flags & kAltFlag) != 0, name + ", Alt of Shift " + e.type + " event mismatch");
           is(e.shiftKey, e.type == "keydown", name + ", Shift of Shift " + e.type + " event mismatch");
-          return (testingEvent.shift || testingEvent.shiftRight) && removeFlag(e, kShiftFlag);
+          return (testingEvent.shift || testingEvent.shiftRight) && removeFlag(e, kShiftFlag) && expectedDOMKeyCode != e.keyCode;
         case e.DOM_VK_CONTROL:
           is(e.ctrlKey, e.type == "keydown", name + ", Ctrl of Ctrl " + e.type + " event mismatch");
           is(e.metaKey, (flags & kMetaFlag) != 0, name + ", Command of Ctrl " + e.type + " event mismatch");
           is(e.altKey, (flags & kAltFlag) != 0, name + ", Alt of Ctrl " + e.type + " event mismatch");
           is(e.shiftKey, (flags & kShiftFlag) != 0, name + ", Shift of Ctrl " + e.type + " event mismatch");
-          return (testingEvent.ctrl || testingEvent.ctrlRight || (IS_WIN && testingEvent.altGr)) && removeFlag(e, kCtrlFlag);
+          return (testingEvent.ctrl || testingEvent.ctrlRight || (IS_WIN && testingEvent.altGr)) && removeFlag(e, kCtrlFlag) && expectedDOMKeyCode != e.keyCode;
         case e.DOM_VK_ALT:
           is(e.ctrlKey, (flags & kCtrlFlag) != 0, name + ", Ctrl of Alt " + e.type + " event mismatch");
           is(e.metaKey, (flags & kMetaFlag) != 0, name + ", Command of Alt " + e.type + " event mismatch");
           is(e.altKey, e.type == "keydown", name + ", Alt of Alt " + e.type + " event mismatch");
           is(e.shiftKey, (flags & kShiftFlag) != 0, name + ", Shift of Alt " + e.type + " event mismatch");
-          return (testingEvent.alt || testingEvent.altRight || (IS_WIN && testingEvent.altGr)) && removeFlag(e, kAltFlag);
+          return (testingEvent.alt || testingEvent.altRight || (IS_WIN && testingEvent.altGr)) && removeFlag(e, kAltFlag) && expectedDOMKeyCode != e.keyCode;
         case e.DOM_VK_META:
           is(e.ctrlKey, (flags & kCtrlFlag) != 0, name + ", Ctrl of Command " + e.type + " evnet mismatch");
           is(e.metaKey, e.type == "keydown", name + ", Command of Command " + e.type + " evnet mismatch");
           is(e.altKey, (flags & kAltFlag) != 0, name + ", Alt of Command " + e.type + " evnet mismatch");
           is(e.shiftKey, (flags & kShiftFlag) != 0, name + ", Shift of Command " + e.type + " evnet mismatch");
-          return testingEvent.command && removeFlag(e, kMetaFlag);
+          return testingEvent.command && removeFlag(e, kMetaFlag) && expectedDOMKeyCode != e.keyCode;
         case e.DOM_VK_NUM_LOCK:
           is(e.ctrlKey, (flags & kCtrlFlag) != 0, name + ", Ctrl of NumLock " + e.type + " event mismatch");
           is(e.metaKey, (flags & kMetaFlag) != 0, name + ", Command of NumLock " + e.type + " event mismatch");
           is(e.altKey, (flags & kAltFlag) != 0, name + ", Alt of NumLock " + e.type + " event mismatch");
           is(e.shiftKey, (flags & kShiftFlag) != 0, name + ", Shift of NumLock " + e.type + " event mismatch");
-          return testingEvent.numLock && removeFlag(e, kNumLockFlag);
+          return testingEvent.numLock && removeFlag(e, kNumLockFlag) && expectedDOMKeyCode != e.keyCode;
         case e.DOM_VK_CAPS_LOCK:
           is(e.ctrlKey, (flags & kCtrlFlag) != 0, name + ", Ctrl of CapsLock " + e.type + " event mismatch");
           is(e.metaKey, (flags & kMetaFlag) != 0, name + ", Command of CapsLock " + e.type + " event mismatch");
           is(e.altKey, (flags & kAltFlag) != 0, name + ", Alt of CapsLock " + e.type + " event mismatch");
           is(e.shiftKey, (flags & kShiftFlag) != 0, name + ", Shift of CapsLock " + e.type + " event mismatch");
-          return testingEvent.capsLock && removeFlag(e, kCapsLockFlag);
+          return testingEvent.capsLock && removeFlag(e, kCapsLockFlag) && expectedDOMKeyCode != e.keyCode;
       }
       return false;
     }
@@ -257,7 +257,7 @@ function runKeyEventTests()
   // what to test against. The third parameter is which key events should be
   // delived for the event.
   function testKey(aEvent, aExpectedGeckoKeyCode, aExpectGeckoChar,
-                   aShouldDelivedEvent)
+                   aShouldDelivedEvent, aExpectLocation)
   {
     ok(aExpectedGeckoKeyCode != undefined, "keycode is undefined");
     eventList = [];
@@ -284,6 +284,7 @@ function runKeyEventTests()
     }
 
     testingEvent = aEvent;
+    expectedDOMKeyCode = aExpectedGeckoKeyCode;
 
     synthesizeKey(aEvent, "button");
 
@@ -342,6 +343,7 @@ function runKeyEventTests()
             is(e.keyCode, aExpectedGeckoKeyCode, name + ", wrong keycode");
           }
         }
+        is(e.location, aExpectLocation, name + ", wrong location");
       }
     }
   }
@@ -366,973 +368,973 @@ function runKeyEventTests()
 
     // Ctrl keys
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, ctrl:1, chars:"\u0001", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, ctrl:1, shift:1, chars:"\u0001", unmodifiedChars:"A"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Alt keys
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, alt:1, chars:"\u00e5", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00e5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00e5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, alt:1, shift:1, chars:"\u00c5", unmodifiedChars:"A"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00c5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00c5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     
     // Command keys
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, command:1, chars:"a", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // Shift-cmd gives us the shifted character
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, command:1, shift:1, chars:"a", unmodifiedChars:"A"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // Ctrl-cmd gives us the unshifted character
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, command:1, ctrl:1, chars:"\u0001", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // Alt-cmd gives us the shifted character
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, command:1, alt:1, chars:"\u00e5", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00e5", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00e5", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, command:1, alt:1, shift:1, chars:"\u00c5", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00c5", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00c5", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Greek ctrl keys produce Latin charcodes
     testKey({layout:"Greek", keyCode:MAC_VK_ANSI_A, ctrl:1, chars:"\u0001", unmodifiedChars:"\u03b1"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Greek", keyCode:MAC_VK_ANSI_A, ctrl:1, shift:1, chars:"\u0001", unmodifiedChars:"\u0391"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Greek command keys
     testKey({layout:"Greek", keyCode:MAC_VK_ANSI_A, command:1, chars:"a", unmodifiedChars:"\u03b1"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // Shift-cmd gives us the shifted character
     testKey({layout:"Greek", keyCode:MAC_VK_ANSI_A, command:1, shift:1, chars:"a", unmodifiedChars:"\u0391"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // Ctrl-cmd gives us the unshifted character
     testKey({layout:"Greek", keyCode:MAC_VK_ANSI_A, command:1, ctrl:1, chars:"\u0001", unmodifiedChars:"\u03b1"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // Alt-cmd gives us the shifted character
     testKey({layout:"Greek", keyCode:MAC_VK_ANSI_A, command:1, alt:1, chars:"\u00a8", unmodifiedChars:"\u03b1"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00a8", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00a8", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Greek", keyCode:MAC_VK_ANSI_A, command:1, alt:1, shift:1, chars:"\u00b9", unmodifiedChars:"\u0391"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00b9", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00b9", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // German
     testKey({layout:"German", keyCode:MAC_VK_ANSI_A, chars:"a", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"German", keyCode:MAC_VK_ANSI_LeftBracket, chars:"\u00fc", unmodifiedChars:"\u00fc"},
-            0, "\u00fc", SHOULD_DELIVER_ALL);
+            0, "\u00fc", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"German", keyCode:MAC_VK_ANSI_Minus, chars:"\u00df", unmodifiedChars:"\u00df"},
-            nsIDOMKeyEvent.DOM_VK_QUESTION_MARK, "\u00df", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUESTION_MARK, "\u00df", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"German", keyCode:MAC_VK_ANSI_Minus, shift:1, chars:"?", unmodifiedChars:"?"},
-            nsIDOMKeyEvent.DOM_VK_QUESTION_MARK, "?", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUESTION_MARK, "?", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // Note that Shift+SS is '?' but Cmd+Shift+SS is '/' on German layout.
     // Therefore, when Cmd key is pressed, the SS key's keycode is changed.
     testKey({layout:"German", keyCode:MAC_VK_ANSI_Minus, command:1, chars:"\u00df", unmodifiedChars:"\u00df"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "\u00df", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "\u00df", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"German", keyCode:MAC_VK_ANSI_Minus, command:1, shift:1, chars:"/", unmodifiedChars:"?"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "?", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "?", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Caps Lock key event
     // XXX keyup event of Caps Lock key is not fired.
     testKey({layout:"US", keyCode:MAC_VK_CapsLock, capsLock:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_CapsLock, capsLock:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Shift/RightShift key event
     testKey({layout:"US", keyCode:MAC_VK_Shift, shift:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_Shift, shift:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_RightShift, shiftRight:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
     testKey({layout:"US", keyCode:MAC_VK_RightShift, shiftRight:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
 
     // Control/RightControl key event
     testKey({layout:"US", keyCode:MAC_VK_Control, ctrl:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_Control, ctrl:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_RightControl, ctrlRight:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
     testKey({layout:"US", keyCode:MAC_VK_RightControl, ctrlRight:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
 
     // Option/RightOption key event
     testKey({layout:"US", keyCode:MAC_VK_Option, alt:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_Option, alt:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_RightOption, altRight:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
     testKey({layout:"US", keyCode:MAC_VK_RightOption, altRight:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
 
     // Command/RightCommand key event
     testKey({layout:"US", keyCode:MAC_VK_Command, command:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_Command, command:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
     testKey({layout:"US", keyCode:MAC_VK_RightCommand, commandRight:1, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYDOWN);
+            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYDOWN, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
     testKey({layout:"US", keyCode:MAC_VK_RightCommand, commandRight:0, chars:"", unmodifiedChars:""},
-            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_META, "", SHOULD_DELIVER_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
 
     // all keys on keyboard (keyCode test)
     testKey({layout:"US", keyCode:MAC_VK_Tab, chars:"\t", unmodifiedChars:"\t"},
-            nsIDOMKeyEvent.DOM_VK_TAB, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_TAB, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadClear, chars:"\uF739", unmodifiedChars:"\uF739"},
-            nsIDOMKeyEvent.DOM_VK_CLEAR, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLEAR, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_Return, chars:"\u000D", unmodifiedChars:"\u000D"},
-            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F15, chars:"\uF712", unmodifiedChars:"\uF712"},
-            nsIDOMKeyEvent.DOM_VK_PAUSE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PAUSE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_Escape, chars:"\u001B", unmodifiedChars:"\u001B"},
-            nsIDOMKeyEvent.DOM_VK_ESCAPE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ESCAPE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_Space, chars:" ", unmodifiedChars:" "},
-            nsIDOMKeyEvent.DOM_VK_SPACE, " ", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SPACE, " ", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_PageUp, chars:"\uF72C", unmodifiedChars:"\uF72C"},
-            nsIDOMKeyEvent.DOM_VK_PAGE_UP, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PAGE_UP, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_PageDown, chars:"\uF72D", unmodifiedChars:"\uF72D"},
-            nsIDOMKeyEvent.DOM_VK_PAGE_DOWN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PAGE_DOWN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_End, chars:"\uF72B", unmodifiedChars:"\uF72B"},
-            nsIDOMKeyEvent.DOM_VK_END, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_END, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_Home, chars:"\uF729", unmodifiedChars:"\uF729"},
-            nsIDOMKeyEvent.DOM_VK_HOME, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HOME, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_LeftArrow, chars:"\uF702", unmodifiedChars:"\uF702"},
-            nsIDOMKeyEvent.DOM_VK_LEFT, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_LEFT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_UpArrow, chars:"\uF700", unmodifiedChars:"\uF700"},
-            nsIDOMKeyEvent.DOM_VK_UP, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_UP, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_RightArrow, chars:"\uF703", unmodifiedChars:"\uF703"},
-            nsIDOMKeyEvent.DOM_VK_RIGHT, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_RIGHT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_DownArrow, chars:"\uF701", unmodifiedChars:"\uF701"},
-            nsIDOMKeyEvent.DOM_VK_DOWN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DOWN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_PC_PrintScreen, chars:"\uF710", unmodifiedChars:"\uF710"},
-            nsIDOMKeyEvent.DOM_VK_PRINTSCREEN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PRINTSCREEN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_PC_Delete, chars:"\uF728", unmodifiedChars:"\uF728"},
-            nsIDOMKeyEvent.DOM_VK_DELETE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DELETE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_PC_Pause, chars:"\uF711", unmodifiedChars:"\uF711"},
-            nsIDOMKeyEvent.DOM_VK_SCROLL_LOCK, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SCROLL_LOCK, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"US", keyCode:MAC_VK_F1, function:1, chars:"\uF704", unmodifiedChars:"\uF704"},
-            nsIDOMKeyEvent.DOM_VK_F1, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F1, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F2, function:1, chars:"\uF705", unmodifiedChars:"\uF705"},
-            nsIDOMKeyEvent.DOM_VK_F2, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F2, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F3, function:1, chars:"\uF706", unmodifiedChars:"\uF706"},
-            nsIDOMKeyEvent.DOM_VK_F3, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F3, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F4, function:1, chars:"\uF707", unmodifiedChars:"\uF707"},
-            nsIDOMKeyEvent.DOM_VK_F4, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F4, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F5, function:1, chars:"\uF708", unmodifiedChars:"\uF708"},
-            nsIDOMKeyEvent.DOM_VK_F5, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F5, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F6, function:1, chars:"\uF709", unmodifiedChars:"\uF709"},
-            nsIDOMKeyEvent.DOM_VK_F6, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F6, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F7, function:1, chars:"\uF70A", unmodifiedChars:"\uF70A"},
-            nsIDOMKeyEvent.DOM_VK_F7, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F7, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F8, function:1, chars:"\uF70B", unmodifiedChars:"\uF70B"},
-            nsIDOMKeyEvent.DOM_VK_F8, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F8, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F9, function:1, chars:"\uF70C", unmodifiedChars:"\uF70C"},
-            nsIDOMKeyEvent.DOM_VK_F9, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F9, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F10, function:1, chars:"\uF70D", unmodifiedChars:"\uF70D"},
-            nsIDOMKeyEvent.DOM_VK_F10, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F10, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F11, function:1, chars:"\uF70E", unmodifiedChars:"\uF70E"},
-            nsIDOMKeyEvent.DOM_VK_F11, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F11, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F12, function:1, chars:"\uF70F", unmodifiedChars:"\uF70F"},
-            nsIDOMKeyEvent.DOM_VK_F12, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F12, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F16, function:1, chars:"\uF713", unmodifiedChars:"\uF713"},
-            nsIDOMKeyEvent.DOM_VK_F16, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F16, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F17, function:1, chars:"\uF714", unmodifiedChars:"\uF714"},
-            nsIDOMKeyEvent.DOM_VK_F17, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F17, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F18, function:1, chars:"\uF715", unmodifiedChars:"\uF715"},
-            nsIDOMKeyEvent.DOM_VK_F18, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F18, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_F19, function:1, chars:"\uF716", unmodifiedChars:"\uF716"},
-            nsIDOMKeyEvent.DOM_VK_F19, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F19, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // US
     // Alphabet
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, chars:"a", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, shift:1, chars:"A", unmodifiedChars:"A"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, ctrl:1, chars:"\u0001", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, alt:1, chars:"\u00E5", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00E5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00E5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_A, command:1, chars:"a", unmodifiedChars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_B, chars:"b", unmodifiedChars:"b"},
-            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_B, shift:1, chars:"B", unmodifiedChars:"B"},
-            nsIDOMKeyEvent.DOM_VK_B, "B", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_B, "B", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_B, ctrl:1, chars:"\u0002", unmodifiedChars:"b"},
-            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_B, alt:1, chars:"\u222B", unmodifiedChars:"b"},
-            nsIDOMKeyEvent.DOM_VK_B, "\u222B", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_B, "\u222B", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_B, command:1, chars:"b", unmodifiedChars:"b"},
-            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_C, chars:"c", unmodifiedChars:"c"},
-            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_C, shift:1, chars:"C", unmodifiedChars:"C"},
-            nsIDOMKeyEvent.DOM_VK_C, "C", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_C, "C", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_C, ctrl:1, chars:"\u0003", unmodifiedChars:"c"},
-            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_C, alt:1, chars:"\u00E7", unmodifiedChars:"c"},
-            nsIDOMKeyEvent.DOM_VK_C, "\u00E7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_C, "\u00E7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_C, command:1, chars:"c", unmodifiedChars:"c"},
-            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_D, chars:"d", unmodifiedChars:"d"},
-            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_D, shift:1, chars:"D", unmodifiedChars:"D"},
-            nsIDOMKeyEvent.DOM_VK_D, "D", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_D, "D", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_D, ctrl:1, chars:"\u0004", unmodifiedChars:"d"},
-            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_D, alt:1, chars:"\u2202", unmodifiedChars:"d"},
-            nsIDOMKeyEvent.DOM_VK_D, "\u2202", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_D, "\u2202", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_D, command:1, chars:"d", unmodifiedChars:"d"},
-            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_E, chars:"e", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_E, shift:1, chars:"E", unmodifiedChars:"E"},
-            nsIDOMKeyEvent.DOM_VK_E, "E", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "E", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_E, ctrl:1, chars:"\u0005", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_E, alt:1, chars:"", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "", SHOULD_DELIVER_NONE); // dead key
+            nsIDOMKeyEvent.DOM_VK_E, "", SHOULD_DELIVER_NONE, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // dead key
     testKey({layout:"US", keyCode:MAC_VK_ANSI_E, command:1, chars:"e", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_F, chars:"f", unmodifiedChars:"f"},
-            nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_F, shift:1, chars:"F", unmodifiedChars:"F"},
-            nsIDOMKeyEvent.DOM_VK_F, "F", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F, "F", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_F, ctrl:1, chars:"\u0006", unmodifiedChars:"f"},
-            nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_F, alt:1, chars:"\u0192", unmodifiedChars:"f"},
-            nsIDOMKeyEvent.DOM_VK_F, "\u0192", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F, "\u0192", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // XXX This test starts fullscreen mode.
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_F, command:1, chars:"f", unmodifiedChars:"f"},
-    //         nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+    //         nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_G, chars:"g", unmodifiedChars:"g"},
-            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_G, shift:1, chars:"G", unmodifiedChars:"G"},
-            nsIDOMKeyEvent.DOM_VK_G, "G", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_G, "G", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_G, ctrl:1, chars:"\u0007", unmodifiedChars:"g"},
-            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_G, alt:1, chars:"\u00A9", unmodifiedChars:"g"},
-            nsIDOMKeyEvent.DOM_VK_G, "\u00A9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_G, "\u00A9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_G, command:1, chars:"g", unmodifiedChars:"g"},
-            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_H, chars:"h", unmodifiedChars:"h"},
-            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_H, shift:1, chars:"H", unmodifiedChars:"H"},
-            nsIDOMKeyEvent.DOM_VK_H, "H", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_H, "H", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_H, ctrl:1, chars:"\u0008", unmodifiedChars:"h"},
-            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_H, alt:1, chars:"\u02D9", unmodifiedChars:"h"},
-            nsIDOMKeyEvent.DOM_VK_H, "\u02D9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_H, "\u02D9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_H, command:1, chars:"h", unmodifiedChars:"h"},
-            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_I, chars:"i", unmodifiedChars:"i"},
-            nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_I, shift:1, chars:"I", unmodifiedChars:"I"},
-            nsIDOMKeyEvent.DOM_VK_I, "I", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_I, "I", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_I, ctrl:1, chars:"\u0009", unmodifiedChars:"i"},
-            nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_I, alt:1, chars:"", unmodifiedChars:"i"},
-            nsIDOMKeyEvent.DOM_VK_I, "", SHOULD_DELIVER_NONE); // dead key
+            nsIDOMKeyEvent.DOM_VK_I, "", SHOULD_DELIVER_NONE, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // dead key
     // XXX This test causes memory leak.
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_I, command:1, chars:"i", unmodifiedChars:"i"},
-    //         nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+    //         nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_J, chars:"j", unmodifiedChars:"j"},
-            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_J, shift:1, chars:"J", unmodifiedChars:"J"},
-            nsIDOMKeyEvent.DOM_VK_J, "J", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_J, "J", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_J, ctrl:1, chars:"\u000A", unmodifiedChars:"j"},
-            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_J, alt:1, chars:"\u2206", unmodifiedChars:"j"},
-            nsIDOMKeyEvent.DOM_VK_J, "\u2206", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_J, "\u2206", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_J, command:1, chars:"j", unmodifiedChars:"j"},
-            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_K, chars:"k", unmodifiedChars:"k"},
-            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_K, shift:1, chars:"K", unmodifiedChars:"K"},
-            nsIDOMKeyEvent.DOM_VK_K, "K", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_K, "K", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_K, ctrl:1, chars:"\u000B", unmodifiedChars:"k"},
-            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_K, alt:1, chars:"\u02DA", unmodifiedChars:"k"},
-            nsIDOMKeyEvent.DOM_VK_K, "\u02DA", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_K, "\u02DA", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_K, command:1, chars:"k", unmodifiedChars:"k"},
-            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_L, chars:"l", unmodifiedChars:"l"},
-            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_L, shift:1, chars:"L", unmodifiedChars:"L"},
-            nsIDOMKeyEvent.DOM_VK_L, "L", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_L, "L", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_L, ctrl:1, chars:"\u000C", unmodifiedChars:"l"},
-            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_L, alt:1, chars:"\u00AC", unmodifiedChars:"l"},
-            nsIDOMKeyEvent.DOM_VK_L, "\u00AC", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_L, "\u00AC", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_L, command:1, chars:"l", unmodifiedChars:"l"},
-            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_M, chars:"m", unmodifiedChars:"m"},
-            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_M, shift:1, chars:"M", unmodifiedChars:"M"},
-            nsIDOMKeyEvent.DOM_VK_M, "M", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_M, "M", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_M, ctrl:1, chars:"\u000D", unmodifiedChars:"m"},
-            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_M, alt:1, chars:"\u00B5", unmodifiedChars:"m"},
-            nsIDOMKeyEvent.DOM_VK_M, "\u00B5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_M, "\u00B5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_M, command:1, chars:"m", unmodifiedChars:"m"},
-            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_N, chars:"n", unmodifiedChars:"n"},
-            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_N, shift:1, chars:"N", unmodifiedChars:"N"},
-            nsIDOMKeyEvent.DOM_VK_N, "N", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_N, "N", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_N, ctrl:1, chars:"\u000E", unmodifiedChars:"n"},
-            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_N, alt:1, chars:"", unmodifiedChars:"n"},
-            nsIDOMKeyEvent.DOM_VK_N, "", SHOULD_DELIVER_NONE); // dead key
+            nsIDOMKeyEvent.DOM_VK_N, "", SHOULD_DELIVER_NONE, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // dead key
     testKey({layout:"US", keyCode:MAC_VK_ANSI_N, command:1, chars:"n", unmodifiedChars:"n"},
-            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_O, chars:"o", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_O, shift:1, chars:"O", unmodifiedChars:"O"},
-            nsIDOMKeyEvent.DOM_VK_O, "O", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "O", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_O, ctrl:1, chars:"\u000F", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_O, alt:1, chars:"\u00F8", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "\u00F8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "\u00F8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_O, command:1, chars:"o", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_P, chars:"p", unmodifiedChars:"p"},
-            nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_P, shift:1, chars:"P", unmodifiedChars:"P"},
-            nsIDOMKeyEvent.DOM_VK_P, "P", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_P, "P", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_P, ctrl:1, chars:"\u0010", unmodifiedChars:"p"},
-            nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_P, alt:1, chars:"\u03C0", unmodifiedChars:"p"},
-            nsIDOMKeyEvent.DOM_VK_P, "\u03C0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_P, "\u03C0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // XXX This test starts private browsing mode (stopped at the confirmation dialog)
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_P, command:1, chars:"p", unmodifiedChars:"p"},
-    //         nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+    //         nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Q, chars:"q", unmodifiedChars:"q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Q, shift:1, chars:"Q", unmodifiedChars:"Q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "Q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "Q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Q, ctrl:1, chars:"\u0011", unmodifiedChars:"q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Q, alt:1, chars:"\u0153", unmodifiedChars:"q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "\u0153", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "\u0153", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Q, command:1, chars:"q", unmodifiedChars:"q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_R, chars:"r", unmodifiedChars:"r"},
-            nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_R, shift:1, chars:"R", unmodifiedChars:"R"},
-            nsIDOMKeyEvent.DOM_VK_R, "R", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_R, "R", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_R, ctrl:1, chars:"\u0012", unmodifiedChars:"r"},
-            nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_R, alt:1, chars:"\u00AE", unmodifiedChars:"r"},
-            nsIDOMKeyEvent.DOM_VK_R, "\u00AE", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_R, "\u00AE", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // XXX This test makes some tabs and dialogs.
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_R, command:1, chars:"r", unmodifiedChars:"r"},
-    //         nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+    //         nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_S, chars:"s", unmodifiedChars:"s"},
-            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_S, shift:1, chars:"S", unmodifiedChars:"S"},
-            nsIDOMKeyEvent.DOM_VK_S, "S", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_S, "S", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_S, ctrl:1, chars:"\u0013", unmodifiedChars:"s"},
-            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_S, alt:1, chars:"\u00DF", unmodifiedChars:"s"},
-            nsIDOMKeyEvent.DOM_VK_S, "\u00DF", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_S, "\u00DF", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_S, command:1, chars:"s", unmodifiedChars:"s"},
-            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_T, chars:"t", unmodifiedChars:"t"},
-            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_T, shift:1, chars:"T", unmodifiedChars:"T"},
-            nsIDOMKeyEvent.DOM_VK_T, "T", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_T, "T", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_T, ctrl:1, chars:"\u0014", unmodifiedChars:"t"},
-            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_T, alt:1, chars:"\u2020", unmodifiedChars:"t"},
-            nsIDOMKeyEvent.DOM_VK_T, "\u2020", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_T, "\u2020", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_T, command:1, chars:"t", unmodifiedChars:"t"},
-            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_U, chars:"u", unmodifiedChars:"u"},
-            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_U, shift:1, chars:"U", unmodifiedChars:"U"},
-            nsIDOMKeyEvent.DOM_VK_U, "U", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_U, "U", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_U, ctrl:1, chars:"\u0015", unmodifiedChars:"u"},
-            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_U, alt:1, chars:"", unmodifiedChars:"u"},
-            nsIDOMKeyEvent.DOM_VK_U, "", SHOULD_DELIVER_NONE); // dead key
+            nsIDOMKeyEvent.DOM_VK_U, "", SHOULD_DELIVER_NONE, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // dead key
     testKey({layout:"US", keyCode:MAC_VK_ANSI_U, command:1, chars:"u", unmodifiedChars:"u"},
-            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_V, chars:"v", unmodifiedChars:"v"},
-            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_V, shift:1, chars:"V", unmodifiedChars:"V"},
-            nsIDOMKeyEvent.DOM_VK_V, "V", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_V, "V", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_V, ctrl:1, chars:"\u0016", unmodifiedChars:"v"},
-            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_V, alt:1, chars:"\u221A", unmodifiedChars:"v"},
-            nsIDOMKeyEvent.DOM_VK_V, "\u221A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_V, "\u221A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_V, command:1, chars:"v", unmodifiedChars:"v"},
-            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_W, chars:"w", unmodifiedChars:"w"},
-            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_W, shift:1, chars:"W", unmodifiedChars:"W"},
-            nsIDOMKeyEvent.DOM_VK_W, "W", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_W, "W", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_W, ctrl:1, chars:"\u0017", unmodifiedChars:"w"},
-            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_W, alt:1, chars:"\u2211", unmodifiedChars:"w"},
-            nsIDOMKeyEvent.DOM_VK_W, "\u2211", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_W, "\u2211", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_W, command:1, chars:"w", unmodifiedChars:"w"},
-            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_X, chars:"x", unmodifiedChars:"x"},
-            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_X, shift:1, chars:"X", unmodifiedChars:"X"},
-            nsIDOMKeyEvent.DOM_VK_X, "X", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_X, "X", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_X, ctrl:1, chars:"\u0018", unmodifiedChars:"x"},
-            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_X, alt:1, chars:"\u2248", unmodifiedChars:"x"},
-            nsIDOMKeyEvent.DOM_VK_X, "\u2248", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_X, "\u2248", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_X, command:1, chars:"x", unmodifiedChars:"x"},
-            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Y, chars:"y", unmodifiedChars:"y"},
-            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Y, shift:1, chars:"Y", unmodifiedChars:"Y"},
-            nsIDOMKeyEvent.DOM_VK_Y, "Y", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Y, "Y", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Y, ctrl:1, chars:"\u0019", unmodifiedChars:"y"},
-            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Y, alt:1, chars:"\u00A5", unmodifiedChars:"y"},
-            nsIDOMKeyEvent.DOM_VK_Y, "\u00A5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Y, "\u00A5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Y, command:1, chars:"y", unmodifiedChars:"y"},
-            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Z, chars:"z", unmodifiedChars:"z"},
-            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Z, shift:1, chars:"Z", unmodifiedChars:"Z"},
-            nsIDOMKeyEvent.DOM_VK_Z, "Z", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Z, "Z", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Z, ctrl:1, chars:"\u001A", unmodifiedChars:"z"},
-            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Z, alt:1, chars:"\u03A9", unmodifiedChars:"z"},
-            nsIDOMKeyEvent.DOM_VK_Z, "\u03A9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Z, "\u03A9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Z, command:1, chars:"z", unmodifiedChars:"z"},
-            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // numeric
     testKey({layout:"US", keyCode:MAC_VK_ANSI_1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_1, shift:1, chars:"!", unmodifiedChars:"!"},
-            nsIDOMKeyEvent.DOM_VK_1, "!", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "!", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_1, ctrl:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_1, alt:1, chars:"\u00A1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "\u00A1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "\u00A1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_1, command:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_2, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_2, shift:1, chars:"@", unmodifiedChars:"@"},
-            nsIDOMKeyEvent.DOM_VK_2, "@", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "@", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_2, ctrl:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_2, alt:1, chars:"\u00A1", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "\u00A1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "\u00A1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_2, command:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_3, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_3, shift:1, chars:"#", unmodifiedChars:"#"},
-            nsIDOMKeyEvent.DOM_VK_3, "#", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "#", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_3, ctrl:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_3, alt:1, chars:"\u00A3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "\u00A3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "\u00A3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_3, command:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_4, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_4, shift:1, chars:"$", unmodifiedChars:"$"},
-            nsIDOMKeyEvent.DOM_VK_4, "$", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "$", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_4, ctrl:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_4, alt:1, chars:"\u00A2", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "\u00A2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "\u00A2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_4, command:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_5, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_5, shift:1, chars:"%", unmodifiedChars:"%"},
-            nsIDOMKeyEvent.DOM_VK_5, "%", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "%", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_5, ctrl:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_5, alt:1, chars:"\u221E", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "\u221E", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "\u221E", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_5, command:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_6, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_6, shift:1, chars:"^", unmodifiedChars:"^"},
-            nsIDOMKeyEvent.DOM_VK_6, "^", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "^", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_6, ctrl:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_6, alt:1, chars:"\u00A7", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "\u00A7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "\u00A7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_6, command:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_7, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_7, shift:1, chars:"\u0026;", unmodifiedChars:"\u0026;"},
-            nsIDOMKeyEvent.DOM_VK_7, "\u0026", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "\u0026", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_7, ctrl:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_7, alt:1, chars:"\u00B6", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "\u00B6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "\u00B6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_7, command:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_8, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_8, shift:1, chars:"*", unmodifiedChars:"*"},
-            nsIDOMKeyEvent.DOM_VK_8, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_8, ctrl:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_8, alt:1, chars:"\u2022", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "\u2022", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "\u2022", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_8, command:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_9, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_9, shift:1, chars:"(", unmodifiedChars:"("},
-            nsIDOMKeyEvent.DOM_VK_9, "(", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "(", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_9, ctrl:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_9, alt:1, chars:"\u00AA", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "\u00AA", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "\u00AA", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_9, command:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_0, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_0, shift:1, chars:")", unmodifiedChars:")"},
-            nsIDOMKeyEvent.DOM_VK_0, ")", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, ")", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_0, ctrl:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_0, alt:1, chars:"\u00BA", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "\u00BA", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "\u00BA", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_0, command:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // other chracters
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Grave, chars:"`", unmodifiedChars:"`"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Grave, shift:1, chars:"~", unmodifiedChars:"~"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "~", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "~", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Grave, ctrl:1, chars:"`", unmodifiedChars:"`"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Grave, alt:1, chars:"", unmodifiedChars:"`"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_NONE); // dead key
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_NONE, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // dead key
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Grave, command:1, chars:"`", unmodifiedChars:"`"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Minus, chars:"-", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Minus, shift:1, chars:"_", unmodifiedChars:"_"},
-            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "_", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "_", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // TODO:
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_Minus, ctrl:1, chars:"\u001F", unmodifiedChars:"-"},
-    //         nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_ALL);
+    //         nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Minus, alt:1, chars:"\u2013", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "\u2013", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "\u2013", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Minus, command:1, chars:"-", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Equal, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Equal, shift:1, chars:"+", unmodifiedChars:"+"},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Equal, ctrl:1, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Equal, alt:1, chars:"\u2260", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "\u2260", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "\u2260", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Equal, command:1, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_LeftBracket, chars:"[", unmodifiedChars:"["},
-            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_LeftBracket, shift:1, chars:"{", unmodifiedChars:"{"},
-            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "{", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "{", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // TODO:
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_LeftBracket, ctrl:1, chars:"\u001B", unmodifiedChars:"["},
-    //         nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_ALL);
+    //         nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_LeftBracket, alt:1, chars:"\u201C", unmodifiedChars:"["},
-            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "\u201C", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "\u201C", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_LeftBracket, command:1, chars:"[", unmodifiedChars:"["},
-            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_RightBracket, chars:"]", unmodifiedChars:"]"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_RightBracket, shift:1, chars:"}", unmodifiedChars:"}"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "}", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "}", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // TODO:
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_RightBracket, ctrl:1, chars:"\u001D", unmodifiedChars:"]"},
-    //         nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_ALL);
+    //         nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_RightBracket, alt:1, chars:"\u2018", unmodifiedChars:"]"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "\u2018", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "\u2018", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_RightBracket, command:1, chars:"]", unmodifiedChars:"]"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Backslash, chars:"\\", unmodifiedChars:"\\"},
-            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Backslash, shift:1, chars:"|", unmodifiedChars:"|"},
-            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "|", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "|", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // TODO:
     // testKey({layout:"US", keyCode:MAC_VK_ANSI_Backslash, ctrl:1, chars:"\u001C", unmodifiedChars:"\\"},
-    //         nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_ALL);
+    //         nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Backslash, alt:1, chars:"\u00AB", unmodifiedChars:"\\"},
-            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\u00AB", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\u00AB", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Backslash, command:1, chars:"\\", unmodifiedChars:"\\"},
-            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Semicolon, chars:";", unmodifiedChars:";"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Semicolon, shift:1, chars:":", unmodifiedChars:":"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ":", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ":", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Semicolon, ctrl:1, chars:";", unmodifiedChars:";"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Semicolon, alt:1, chars:"\u2026", unmodifiedChars:";"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, "\u2026", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, "\u2026", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Semicolon, command:1, chars:";", unmodifiedChars:";"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Quote, chars:"'", unmodifiedChars:"'"},
-            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Quote, shift:1, chars:"\"", unmodifiedChars:"\""},
-            nsIDOMKeyEvent.DOM_VK_QUOTE, "\"", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUOTE, "\"", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Quote, ctrl:1, chars:"'", unmodifiedChars:"'"},
-            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Quote, alt:1, chars:"\u00E6", unmodifiedChars:"'"},
-            nsIDOMKeyEvent.DOM_VK_QUOTE, "\u00E6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUOTE, "\u00E6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Quote, command:1, chars:"'", unmodifiedChars:"'"},
-            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Comma, chars:",", unmodifiedChars:","},
-            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Comma, shift:1, chars:"\u003C", unmodifiedChars:"\u003C"},
-            nsIDOMKeyEvent.DOM_VK_COMMA, "\u003C", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, "\u003C", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Comma, ctrl:1, chars:",", unmodifiedChars:","},
-            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Comma, alt:1, chars:"\u2264", unmodifiedChars:","},
-            nsIDOMKeyEvent.DOM_VK_COMMA, "\u2264", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, "\u2264", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Comma, command:1, chars:",", unmodifiedChars:","},
-            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Period, chars:".", unmodifiedChars:"."},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Period, shift:1, chars:"\u003E", unmodifiedChars:"\u003E"},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, "\u003E", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, "\u003E", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Period, ctrl:1, chars:".", unmodifiedChars:"."},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Period, alt:1, chars:"\u2265", unmodifiedChars:"."},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, "\u2265", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, "\u2265", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Period, command:1, chars:".", unmodifiedChars:"."},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Slash, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Slash, shift:1, chars:"?", unmodifiedChars:"?"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "?", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "?", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Slash, ctrl:1, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Slash, alt:1, chars:"\u00F7", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "\u00F7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "\u00F7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Slash, command:1, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // numpad
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad1, numLock:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad1, numLock:1, shift:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad1, numLock:1, ctrl:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad1, numLock:1, alt:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad1, numLock:1, command:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad2, numLock:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad2, numLock:1, shift:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad2, numLock:1, ctrl:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad2, numLock:1, alt:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad2, numLock:1, command:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad3, numLock:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad3, numLock:1, shift:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad3, numLock:1, ctrl:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad3, numLock:1, alt:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad3, numLock:1, command:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad4, numLock:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad4, numLock:1, shift:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad4, numLock:1, ctrl:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad4, numLock:1, alt:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad4, numLock:1, command:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad5, numLock:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad5, numLock:1, shift:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad5, numLock:1, ctrl:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad5, numLock:1, alt:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad5, numLock:1, command:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad6, numLock:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad6, numLock:1, shift:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad6, numLock:1, ctrl:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad6, numLock:1, alt:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad6, numLock:1, command:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad7, numLock:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad7, numLock:1, shift:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad7, numLock:1, ctrl:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad7, numLock:1, alt:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad7, numLock:1, command:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad8, numLock:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad8, numLock:1, shift:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad8, numLock:1, ctrl:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad8, numLock:1, alt:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad8, numLock:1, command:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad9, numLock:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad9, numLock:1, shift:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad9, numLock:1, ctrl:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad9, numLock:1, alt:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad9, numLock:1, command:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad0, numLock:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad0, numLock:1, shift:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad0, numLock:1, ctrl:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad0, numLock:1, alt:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_Keypad0, numLock:1, command:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEquals, numLock:1, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEquals, numLock:1, shift:1, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEquals, numLock:1, ctrl:1, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEquals, numLock:1, alt:1, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEquals, numLock:1, command:1, chars:"=", unmodifiedChars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadDivide, numLock:1, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadDivide, numLock:1, shift:1, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadDivide, numLock:1, ctrl:1, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadDivide, numLock:1, alt:1, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadDivide, numLock:1, command:1, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMultiply, numLock:1, chars:"*", unmodifiedChars:"*"},
-            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMultiply, numLock:1, shift:1, chars:"*", unmodifiedChars:"*"},
-            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMultiply, numLock:1, ctrl:1, chars:"*", unmodifiedChars:"*"},
-            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMultiply, numLock:1, alt:1, chars:"*", unmodifiedChars:"*"},
-            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMultiply, numLock:1, command:1, chars:"*", unmodifiedChars:"*"},
-            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMinus, numLock:1, chars:"-", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMinus, numLock:1, shift:1, chars:"-", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMinus, numLock:1, ctrl:1, chars:"-", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMinus, numLock:1, alt:1, chars:"-", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadMinus, numLock:1, command:1, chars:"-", unmodifiedChars:"-"},
-            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadPlus, numLock:1, chars:"+", unmodifiedChars:"+"},
-            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadPlus, numLock:1, shift:1, chars:"+", unmodifiedChars:"+"},
-            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadPlus, numLock:1, ctrl:1, chars:"+", unmodifiedChars:"+"},
-            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadPlus, numLock:1, alt:1, chars:"+", unmodifiedChars:"+"},
-            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadPlus, numLock:1, command:1, chars:"+", unmodifiedChars:"+"},
-            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEnter, numLock:1, chars:"\u0003", unmodifiedChars:"\u0003"},
-            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEnter, numLock:1, shift:1, chars:"\u0003", unmodifiedChars:"\u0003"},
-            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEnter, numLock:1, ctrl:1, chars:"\u0003", unmodifiedChars:"\u0003"},
-            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEnter, numLock:1, alt:1, chars:"\u0003", unmodifiedChars:"\u0003"},
-            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:MAC_VK_ANSI_KeypadEnter, numLock:1, command:1, chars:"\u0003", unmodifiedChars:"\u0003"},
-            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
 
     // French, numeric
     testKey({layout:"French", keyCode:MAC_VK_ANSI_1, chars:"\u0026", unmodifiedChars:"\u0026"},
-            nsIDOMKeyEvent.DOM_VK_1, "\u0026", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "\u0026", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_1, shift:1, chars:"1", unmodifiedChars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_1, ctrl:1, chars:"1", unmodifiedChars:"\u0026"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_1, command:1, chars:"\u0026", unmodifiedChars:"\u0026"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_2, chars:"\u00E9", unmodifiedChars:"\u00E9"},
-            nsIDOMKeyEvent.DOM_VK_2, "\u00E9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "\u00E9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_2, shift:1, chars:"2", unmodifiedChars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_2, ctrl:1, chars:"2", unmodifiedChars:"\u00E9"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_2, command:1, chars:"\u00E9", unmodifiedChars:"\u00E9"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_3, chars:"\"", unmodifiedChars:"\""},
-            nsIDOMKeyEvent.DOM_VK_3, "\"", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "\"", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_3, shift:1, chars:"3", unmodifiedChars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_3, ctrl:1, chars:"3", unmodifiedChars:"\""},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_3, command:1, chars:"\"", unmodifiedChars:"\""},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_4, chars:"'", unmodifiedChars:"'"},
-            nsIDOMKeyEvent.DOM_VK_4, "'", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "'", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_4, shift:1, chars:"4", unmodifiedChars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_4, ctrl:1, chars:"4", unmodifiedChars:"'"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_4, command:1, chars:"'", unmodifiedChars:"'"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_5, chars:"(", unmodifiedChars:"("},
-            nsIDOMKeyEvent.DOM_VK_5, "(", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "(", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_5, shift:1, chars:"5", unmodifiedChars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_5, ctrl:1, chars:"5", unmodifiedChars:"("},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_5, command:1, chars:"(", unmodifiedChars:"("},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_6, chars:"\u00A7", unmodifiedChars:"\u00A7"},
-            nsIDOMKeyEvent.DOM_VK_6, "\u00A7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "\u00A7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_6, shift:1, chars:"6", unmodifiedChars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // TODO:
     // testKey({layout:"French", keyCode:MAC_VK_ANSI_6, ctrl:1, chars:"\u001D", unmodifiedChars:"\u00A7"},
-    //         nsIDOMKeyEvent.DOM_VK_6, "", SHOULD_DELIVER_ALL); // Ctrl+6 sets strange char
+    //         nsIDOMKeyEvent.DOM_VK_6, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Ctrl+6 sets strange char
     testKey({layout:"French", keyCode:MAC_VK_ANSI_6, command:1, chars:"\u00A7", unmodifiedChars:"\u00A7"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_7, chars:"\u00E8", unmodifiedChars:"\u00E8"},
-            nsIDOMKeyEvent.DOM_VK_7, "\u00E8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "\u00E8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_7, shift:1, chars:"7", unmodifiedChars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_7, ctrl:1, chars:"7", unmodifiedChars:"\u00E8"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_7, command:1, chars:"\u00E8", unmodifiedChars:"\u00E8"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_8, chars:"!", unmodifiedChars:"!"},
-            nsIDOMKeyEvent.DOM_VK_8, "!", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "!", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_8, shift:1, chars:"8", unmodifiedChars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_8, ctrl:1, chars:"8", unmodifiedChars:"!"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_8, command:1, chars:"!", unmodifiedChars:"!"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_9, chars:"\u00E7", unmodifiedChars:"\u00E7"},
-            nsIDOMKeyEvent.DOM_VK_9, "\u00E7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "\u00E7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_9, shift:1, chars:"9", unmodifiedChars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // TODO:
     // testKey({layout:"French", keyCode:MAC_VK_ANSI_9, ctrl:1, chars:"\u001C", unmodifiedChars:"\u00E7"},
-    //         nsIDOMKeyEvent.DOM_VK_9, "", SHOULD_DELIVER_ALL); // Ctrl+9 sets strange char
+    //         nsIDOMKeyEvent.DOM_VK_9, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Ctrl+9 sets strange char
     testKey({layout:"French", keyCode:MAC_VK_ANSI_9, command:1, chars:"\u00E7", unmodifiedChars:"\u00E7"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_0, chars:"\u00E0", unmodifiedChars:"\u00E0"},
-            nsIDOMKeyEvent.DOM_VK_0, "\u00E0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "\u00E0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_0, shift:1, chars:"0", unmodifiedChars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // XXX No events fired, not sure the reason.
     // testKey({layout:"French", keyCode:MAC_VK_ANSI_0, ctrl:1, chars:"", unmodifiedChars:"\u00E0"},
-    //         nsIDOMKeyEvent.DOM_VK_0, "", SHOULD_DELIVER_ALL);
+    //         nsIDOMKeyEvent.DOM_VK_0, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:MAC_VK_ANSI_0, command:1, chars:"\u00E0", unmodifiedChars:"\u00E0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Thai
     // keycode should be DOM_VK_[A-Z] of the key on the latest ASCII capable keyboard layout is for alphabet
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_A, chars:"\u0E1F", unmodifiedChars:"\u0E1F"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u0E1F", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u0E1F", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // keycode should be shifted character if unshifted character isn't an ASCII character
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_Quote, chars:"\u0E07", unmodifiedChars:"\u0E07"},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, "\u0E07", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, "\u0E07", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // keycode should be zero if the character of the key on the latest ASCII capable keyboard layout isn't for alphabet
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_Period, chars:"\u0E43", unmodifiedChars:"\u0E43"},
-            0, "\u0E43", SHOULD_DELIVER_ALL);
+            0, "\u0E43", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     // keycode should be DOM_VK_[0-9] if the key on the latest ASCII capable keyboard layout is for numeric
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_1, chars:"\u0E45", unmodifiedChars:"\u0E45"},
-            nsIDOMKeyEvent.DOM_VK_1, "\u0E45", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "\u0E45", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_2, chars:"/", unmodifiedChars:"/"},
-            nsIDOMKeyEvent.DOM_VK_2, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_3, chars:"_", unmodifiedChars:"_"},
-            nsIDOMKeyEvent.DOM_VK_3, "_", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "_", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_4, chars:"\u0E20", unmodifiedChars:"\u0E20"},
-            nsIDOMKeyEvent.DOM_VK_4, "\u0E20", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "\u0E20", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_5, chars:"\u0E16", unmodifiedChars:"\u0E16"},
-            nsIDOMKeyEvent.DOM_VK_5, "\u0E16", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "\u0E16", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_6, chars:"\u0E38", unmodifiedChars:"\u0E38"},
-            nsIDOMKeyEvent.DOM_VK_6, "\u0E38", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "\u0E38", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_7, chars:"\u0E36", unmodifiedChars:"\u0E36"},
-            nsIDOMKeyEvent.DOM_VK_7, "\u0E36", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "\u0E36", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_8, chars:"\u0E04", unmodifiedChars:"\u0E04"},
-            nsIDOMKeyEvent.DOM_VK_8, "\u0E04", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "\u0E04", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_9, chars:"\u0E15", unmodifiedChars:"\u0E15"},
-            nsIDOMKeyEvent.DOM_VK_9, "\u0E15", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "\u0E15", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Thai", keyCode:MAC_VK_ANSI_0, chars:"\u0E08", unmodifiedChars:"\u0E08"},
-            nsIDOMKeyEvent.DOM_VK_0, "\u0E08", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "\u0E08", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Dvorak-Qwerty, layout should be changed when Command key is pressed.
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_S, chars:"o", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_S, shift:1, chars:"O", unmodifiedChars:"O"},
-            nsIDOMKeyEvent.DOM_VK_O, "O", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "O", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_S, ctrl:1, chars:"\u000F", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_S, alt:1, chars:"\u00F8", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "\u00F8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "\u00F8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_S, command:1, chars:"s", unmodifiedChars:"o"},
-            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_D, chars:"e", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_D, shift:1, chars:"E", unmodifiedChars:"E"},
-            nsIDOMKeyEvent.DOM_VK_E, "E", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "E", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_D, ctrl:1, chars:"\u0005", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_D, alt:1, chars:"", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "", SHOULD_DELIVER_NONE); // dead key
+            nsIDOMKeyEvent.DOM_VK_E, "", SHOULD_DELIVER_NONE, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // dead key
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_D, command:1, chars:"d", unmodifiedChars:"e"},
-            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_I, command:1, alt:1, chars:"^", unmodifiedChars:"c"},
-            nsIDOMKeyEvent.DOM_VK_I, "^", SHOULD_DELIVER_KEYDOWN_KEYPRESS);
+            nsIDOMKeyEvent.DOM_VK_I, "^", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Dvorak-Qwerty", keyCode:MAC_VK_ANSI_I, command:1, alt:1, shift:1, chars:"\u02C6", unmodifiedChars:"C"},
-            nsIDOMKeyEvent.DOM_VK_I, "\u02C6", SHOULD_DELIVER_KEYDOWN_KEYPRESS);  }
+            nsIDOMKeyEvent.DOM_VK_I, "\u02C6", SHOULD_DELIVER_KEYDOWN_KEYPRESS, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);  }
   else if (IS_WIN) {
     // On Windows, you can use Spy++ or Winspector (free) to watch window messages.
     // The keyCode is given by the wParam of the last WM_KEYDOWN message. The
@@ -1341,709 +1343,731 @@ function runKeyEventTests()
 
     // Plain text input
     testKey({layout:"US", keyCode:WIN_VK_A, chars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_B, chars:"b"},
-            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_A, shift:1, chars:"A"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Ctrl keys
     testKey({layout:"US", keyCode:WIN_VK_A, ctrl:1, chars:"\u0001"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_A, ctrl:1, shift:1, chars:"\u0001"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Alt keys
     testKey({layout:"US", keyCode:WIN_VK_A, alt:1, chars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_A, alt:1, shift:1, chars:"A"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Shift-ctrl-alt generates no WM_CHAR, but we still get a keypress
     testKey({layout:"US", keyCode:WIN_VK_A, alt:1, ctrl:1, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Greek plain text
     testKey({layout:"Greek", keyCode:WIN_VK_A, chars:"\u03b1"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u03b1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u03b1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Greek", keyCode:WIN_VK_A, shift:1, chars:"\u0391"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u0391", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u0391", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Greek ctrl keys produce Latin charcodes
     testKey({layout:"Greek", keyCode:WIN_VK_A, ctrl:1, chars:"\u0001"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Greek", keyCode:WIN_VK_A, ctrl:1, shift:1, chars:"\u0001"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Caps Lock key event
     testKey({layout:"US", keyCode:WIN_VK_CAPITAL, capsLock:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_CAPITAL, capsLock:0, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CAPS_LOCK, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
+
+    // Shift keys
+    testKey({layout:"US", keyCode:WIN_VK_LSHIFT, shift:1, chars:""},
+            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
+    testKey({layout:"US", keyCode:WIN_VK_RSHIFT, shiftRight:1, chars:""},
+            nsIDOMKeyEvent.DOM_VK_SHIFT, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
+
+    // Ctrl keys
+    testKey({layout:"US", keyCode:WIN_VK_LCONTROL, ctrl:1, chars:""},
+            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
+    testKey({layout:"US", keyCode:WIN_VK_RCONTROL, ctrlRight:1, chars:""},
+            nsIDOMKeyEvent.DOM_VK_CONTROL, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
+
+    // Alt keys
+    testKey({layout:"US", keyCode:WIN_VK_LMENU, alt:1, chars:""},
+            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
+    testKey({layout:"US", keyCode:WIN_VK_RMENU, altRight:1, chars:""},
+            nsIDOMKeyEvent.DOM_VK_ALT, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
 
     // Win keys
-    testKey({layout:"US", keyCode:WIN_VK_BACK, chars:"\u0008"},
-            nsIDOMKeyEvent.DOM_VK_BACK_SPACE, "", SHOULD_DELIVER_ALL);
+    testKey({layout:"US", keyCode:WIN_VK_LWIN, chars:""},
+            nsIDOMKeyEvent.DOM_VK_WIN, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_LEFT);
+    testKey({layout:"US", keyCode:WIN_VK_RWIN, chars:""},
+            nsIDOMKeyEvent.DOM_VK_WIN, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_RIGHT);
 
     // all keys on keyboard (keyCode test)
+    testKey({layout:"US", keyCode:WIN_VK_BACK, chars:"\u0008"},
+            nsIDOMKeyEvent.DOM_VK_BACK_SPACE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_TAB, chars:"\t"},
-            nsIDOMKeyEvent.DOM_VK_TAB, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_CLEAR, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CLEAR, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_TAB, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_RETURN, chars:"\r"},
-            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_RETURN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_PAUSE, chars:""},
-            nsIDOMKeyEvent.DOM_VK_PAUSE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PAUSE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_KANA, chars:""},
-            nsIDOMKeyEvent.DOM_VK_KANA, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_KANA, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_JUNJA, chars:""},
-            nsIDOMKeyEvent.DOM_VK_JUNJA, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_JUNJA, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_FINAL, chars:""},
-            nsIDOMKeyEvent.DOM_VK_FINAL, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_FINAL, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_KANJI, chars:""},
-            nsIDOMKeyEvent.DOM_VK_KANJI, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_KANJI, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_ESCAPE, chars:""},
-            nsIDOMKeyEvent.DOM_VK_ESCAPE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ESCAPE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_CONVERT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CONVERT, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CONVERT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_NONCONVERT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_NONCONVERT, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NONCONVERT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_ACCEPT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_ACCEPT, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ACCEPT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_MODECHANGE, chars:""},
-            nsIDOMKeyEvent.DOM_VK_MODECHANGE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_MODECHANGE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_SPACE, chars:" "},
-            nsIDOMKeyEvent.DOM_VK_SPACE, " ", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_PRIOR, chars:""},
-            nsIDOMKeyEvent.DOM_VK_PAGE_UP, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_NEXT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_PAGE_DOWN, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_END, chars:""},
-            nsIDOMKeyEvent.DOM_VK_END, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_HOME, chars:""},
-            nsIDOMKeyEvent.DOM_VK_HOME, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_LEFT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_LEFT, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_UP, chars:""},
-            nsIDOMKeyEvent.DOM_VK_UP, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_RIGHT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_RIGHT, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_DOWN, chars:""},
-            nsIDOMKeyEvent.DOM_VK_DOWN, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SPACE, " ", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_SELECT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_SELECT, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SELECT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_PRINT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_PRINT, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PRINT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_EXECUTE, chars:""},
-            nsIDOMKeyEvent.DOM_VK_EXECUTE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EXECUTE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_SNAPSHOT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_PRINTSCREEN, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_INSERT, chars:""},
-            nsIDOMKeyEvent.DOM_VK_INSERT, "", SHOULD_DELIVER_ALL);
-    testKey({layout:"US", keyCode:WIN_VK_DELETE, chars:""},
-            nsIDOMKeyEvent.DOM_VK_DELETE, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PRINTSCREEN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_HELP, chars:""},
-            nsIDOMKeyEvent.DOM_VK_HELP, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HELP, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_SLEEP, chars:""},
-            nsIDOMKeyEvent.DOM_VK_SLEEP, "", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SLEEP, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
+    // XXX TODO: we cannot test Home, Up, PageUp, Left, Right, End, Down, PageDown, Ins and Del.
 
     // US
     // Alphabet
     testKey({layout:"US", keyCode:WIN_VK_A, chars:"a"},
-            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "a", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_A, shift:1, chars:"A"},
-            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "A", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_B, chars:"b"},
-            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_B, "b", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_B, shift:1, chars:"B"},
-            nsIDOMKeyEvent.DOM_VK_B, "B", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_B, "B", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_C, chars:"c"},
-            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_C, "c", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_C, shift:1, chars:"C"},
-            nsIDOMKeyEvent.DOM_VK_C, "C", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_C, "C", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_D, chars:"d"},
-            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_D, "d", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_D, shift:1, chars:"D"},
-            nsIDOMKeyEvent.DOM_VK_D, "D", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_D, "D", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_E, chars:"e"},
-            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "e", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_E, shift:1, chars:"E"},
-            nsIDOMKeyEvent.DOM_VK_E, "E", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_E, "E", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_F, chars:"f"},
-            nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F, "f", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_F, shift:1, chars:"F"},
-            nsIDOMKeyEvent.DOM_VK_F, "F", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_F, "F", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_G, chars:"g"},
-            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_G, "g", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_G, shift:1, chars:"G"},
-            nsIDOMKeyEvent.DOM_VK_G, "G", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_G, "G", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_H, chars:"h"},
-            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_H, "h", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_H, shift:1, chars:"H"},
-            nsIDOMKeyEvent.DOM_VK_H, "H", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_H, "H", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_I, chars:"i"},
-            nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_I, "i", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_I, shift:1, chars:"I"},
-            nsIDOMKeyEvent.DOM_VK_I, "I", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_I, "I", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_J, chars:"j"},
-            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_J, "j", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_J, shift:1, chars:"J"},
-            nsIDOMKeyEvent.DOM_VK_J, "J", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_J, "J", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_K, chars:"k"},
-            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_K, "k", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_K, shift:1, chars:"K"},
-            nsIDOMKeyEvent.DOM_VK_K, "K", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_K, "K", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_L, chars:"l"},
-            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_L, "l", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_L, shift:1, chars:"L"},
-            nsIDOMKeyEvent.DOM_VK_L, "L", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_L, "L", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_M, chars:"m"},
-            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_M, "m", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_M, shift:1, chars:"M"},
-            nsIDOMKeyEvent.DOM_VK_M, "M", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_M, "M", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_N, chars:"n"},
-            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_N, "n", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_N, shift:1, chars:"N"},
-            nsIDOMKeyEvent.DOM_VK_N, "N", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_N, "N", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_O, chars:"o"},
-            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "o", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_O, shift:1, chars:"O"},
-            nsIDOMKeyEvent.DOM_VK_O, "O", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_O, "O", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_P, chars:"p"},
-            nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_P, "p", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_P, shift:1, chars:"P"},
-            nsIDOMKeyEvent.DOM_VK_P, "P", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_P, "P", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_Q, chars:"q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_Q, shift:1, chars:"Q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "Q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "Q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_R, chars:"r"},
-            nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_R, "r", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_R, shift:1, chars:"R"},
-            nsIDOMKeyEvent.DOM_VK_R, "R", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_R, "R", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_S, chars:"s"},
-            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_S, "s", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_S, shift:1, chars:"S"},
-            nsIDOMKeyEvent.DOM_VK_S, "S", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_S, "S", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_T, chars:"t"},
-            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_T, "t", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_T, shift:1, chars:"T"},
-            nsIDOMKeyEvent.DOM_VK_T, "T", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_T, "T", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_U, chars:"u"},
-            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_U, "u", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_U, shift:1, chars:"U"},
-            nsIDOMKeyEvent.DOM_VK_U, "U", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_U, "U", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_V, chars:"v"},
-            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_V, "v", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_V, shift:1, chars:"V"},
-            nsIDOMKeyEvent.DOM_VK_V, "V", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_V, "V", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_W, chars:"w"},
-            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_W, "w", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_W, shift:1, chars:"W"},
-            nsIDOMKeyEvent.DOM_VK_W, "W", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_W, "W", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_X, chars:"x"},
-            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_X, "x", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_X, shift:1, chars:"X"},
-            nsIDOMKeyEvent.DOM_VK_X, "X", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_X, "X", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_Y, chars:"y"},
-            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Y, "y", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_Y, shift:1, chars:"Y"},
-            nsIDOMKeyEvent.DOM_VK_Y, "Y", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Y, "Y", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_Z, chars:"z"},
-            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Z, "z", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_Z, shift:1, chars:"Z"},
-            nsIDOMKeyEvent.DOM_VK_Z, "Z", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Z, "Z", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Numeric
     testKey({layout:"US", keyCode:WIN_VK_0, chars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_0, shift:1, chars:")"},
-            nsIDOMKeyEvent.DOM_VK_0, ")", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, ")", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_1, chars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_1, shift:1, chars:"!"},
-            nsIDOMKeyEvent.DOM_VK_1, "!", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "!", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_2, chars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_2, shift:1, chars:"@"},
-            nsIDOMKeyEvent.DOM_VK_2, "@", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "@", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_3, chars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_3, shift:1, chars:"#"},
-            nsIDOMKeyEvent.DOM_VK_3, "#", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "#", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_4, chars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_4, shift:1, chars:"$"},
-            nsIDOMKeyEvent.DOM_VK_4, "$", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "$", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_5, chars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_5, shift:1, chars:"%"},
-            nsIDOMKeyEvent.DOM_VK_5, "%", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "%", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_6, chars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_6, shift:1, chars:"^"},
-            nsIDOMKeyEvent.DOM_VK_6, "^", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "^", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_7, chars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_7, shift:1, chars:"&"},
-            nsIDOMKeyEvent.DOM_VK_7, "&", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "&", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_8, chars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_8, shift:1, chars:"*"},
-            nsIDOMKeyEvent.DOM_VK_8, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_9, chars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_9, shift:1, chars:"("},
-            nsIDOMKeyEvent.DOM_VK_9, "(", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "(", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // OEM keys
     testKey({layout:"US", keyCode:WIN_VK_OEM_MINUS, chars:"-"},
-            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_MINUS, shift:1, chars:"_"},
-            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "_", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HYPHEN_MINUS, "_", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_PLUS, chars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_PLUS, shift:1, chars:"+"},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_4, chars:"["},
-            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "[", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_4, shift:1, chars:"{"},
-            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "{", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_OPEN_BRACKET, "{", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_6, chars:"]"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "]", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_6, shift:1, chars:"}"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "}", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_BRACKET, "}", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_1, chars:";"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_1, shift:1, chars:":"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ":", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ":", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_7, chars:"'"},
-            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUOTE, "'", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_7, shift:1, chars:"\""},
-            nsIDOMKeyEvent.DOM_VK_QUOTE, "\"", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_QUOTE, "\"", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_5, chars:"\\"},
-            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "\\", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_5, shift:1, chars:"|"},
-            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "|", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_SLASH, "|", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_COMMA, chars:","},
-            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_COMMA, shift:1, chars:"<"},
-            nsIDOMKeyEvent.DOM_VK_COMMA, "<", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, "<", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_PERIOD, chars:"."},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, ".", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_PERIOD, shift:1, chars:">"},
-            nsIDOMKeyEvent.DOM_VK_PERIOD, ">", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERIOD, ">", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_2, chars:"/"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_2, shift:1, chars:"?"},
-            nsIDOMKeyEvent.DOM_VK_SLASH, "?", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SLASH, "?", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_3, chars:"`"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "`", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"US", keyCode:WIN_VK_OEM_3, shift:1, chars:"~"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "~", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "~", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Numpad
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD0, numLock:1, chars:"0"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD1, numLock:1, chars:"1"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD2, numLock:1, chars:"2"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD3, numLock:1, chars:"3"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD4, numLock:1, chars:"4"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD5, numLock:1, chars:"5"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD6, numLock:1, chars:"6"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD7, numLock:1, chars:"7"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD8, numLock:1, chars:"8"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_NUMPAD9, numLock:1, chars:"9"},
-            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_NUMPAD9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
 
     testKey({layout:"US", keyCode:WIN_VK_MULTIPLY, numLock:1, chars:"*"},
-            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_MULTIPLY, numLock:1, shift:1, chars:"*"},
-            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_MULTIPLY, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_ADD, numLock:1, chars:"+"},
-            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_ADD, numLock:1, shift:1, chars:"+"},
-            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ADD, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     // VK_SEPARATOR is keycode for NEC's PC-98 series whose keyboard layout was
     // different from current PC's keyboard layout and it cannot connect to
     // current PC.  Note that even if we synthesize WM_KEYDOWN with
     // VK_SEPARATOR, it doesn't work on Win7.
     //testKey({layout:"US", keyCode:WIN_VK_SEPARATOR, numLock:1, chars:""},
-    //        nsIDOMKeyEvent.DOM_VK_SEPARATOR, "", SHOULD_DELIVER_ALL);
+    //        nsIDOMKeyEvent.DOM_VK_SEPARATOR, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     //testKey({layout:"US", keyCode:WIN_VK_SEPARATOR, numLock:1, shift:1, chars:""},
-    //        nsIDOMKeyEvent.DOM_VK_SEPARATOR, "", SHOULD_DELIVER_ALL);
+    //        nsIDOMKeyEvent.DOM_VK_SEPARATOR, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_SUBTRACT, numLock:1, chars:"-"},
-            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_SUBTRACT, numLock:1, shift:1, chars:"-"},
-            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SUBTRACT, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_DECIMAL, numLock:1, chars:"."},
-            nsIDOMKeyEvent.DOM_VK_DECIMAL, ".", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DECIMAL, ".", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_DECIMAL, numLock:1, shift:1, chars:"."},
-            nsIDOMKeyEvent.DOM_VK_DECIMAL, ".", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DECIMAL, ".", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_DIVIDE, numLock:1, chars:"/"},
-            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
     testKey({layout:"US", keyCode:WIN_VK_DIVIDE, numLock:1, shift:1, chars:"/"},
-            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL);
-    // XXX we cannot test numpad keys without NumLock becasue Windows
-    // uses same keycode for Home, Up, PageUp, Left, Clear(5), Right,
-    // End, Down, PageDown, Ins, Del of Numpad.
+            nsIDOMKeyEvent.DOM_VK_DIVIDE, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+
+    // Numpad without NumLock
+    testKey({layout:"US", keyCode:WIN_VK_PRIOR, chars:""},
+            nsIDOMKeyEvent.DOM_VK_PAGE_UP, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_NEXT, chars:""},
+            nsIDOMKeyEvent.DOM_VK_PAGE_DOWN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_END, chars:""},
+            nsIDOMKeyEvent.DOM_VK_END, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_HOME, chars:""},
+            nsIDOMKeyEvent.DOM_VK_HOME, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_LEFT, chars:""},
+            nsIDOMKeyEvent.DOM_VK_LEFT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_UP, chars:""},
+            nsIDOMKeyEvent.DOM_VK_UP, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_RIGHT, chars:""},
+            nsIDOMKeyEvent.DOM_VK_RIGHT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_DOWN, chars:""},
+            nsIDOMKeyEvent.DOM_VK_DOWN, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_INSERT, chars:""},
+            nsIDOMKeyEvent.DOM_VK_INSERT, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_DELETE, chars:""},
+            nsIDOMKeyEvent.DOM_VK_DELETE, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
+    testKey({layout:"US", keyCode:WIN_VK_CLEAR, chars:""},
+            nsIDOMKeyEvent.DOM_VK_CLEAR, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_NUMPAD);
 
     // Even if widget receives unknown keycode, it should dispatch key events
     // whose keycode is 0 rather than native keycode.
     testKey({layout:"US", keyCode:0x3A, numLock:1, chars:""},
-            0, "", SHOULD_DELIVER_ALL);
+            0, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // French
     // Numeric
     testKey({layout:"French", keyCode:WIN_VK_0, chars:"\u00E0"},
-            nsIDOMKeyEvent.DOM_VK_0, "\u00E0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "\u00E0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_0, shift:1, chars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_1, chars:"&"},
-            nsIDOMKeyEvent.DOM_VK_1, "&", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "&", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_1, shift:1, chars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_2, chars:"\u00E9"},
-            nsIDOMKeyEvent.DOM_VK_2, "\u00E9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "\u00E9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_2, shift:1, chars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_3, chars:"\""},
-            nsIDOMKeyEvent.DOM_VK_3, "\"", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "\"", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_3, shift:1, chars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_4, chars:"'"},
-            nsIDOMKeyEvent.DOM_VK_4, "'", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "'", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_4, shift:1, chars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_5, chars:"("},
-            nsIDOMKeyEvent.DOM_VK_5, "(", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "(", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_5, shift:1, chars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_6, chars:"-"},
-            nsIDOMKeyEvent.DOM_VK_6, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_6, shift:1, chars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_7, chars:"\u00E8"},
-            nsIDOMKeyEvent.DOM_VK_7, "\u00E8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "\u00E8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_7, shift:1, chars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_8, chars:"_"},
-            nsIDOMKeyEvent.DOM_VK_8, "_", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "_", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_8, shift:1, chars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_9, chars:"\u00E7"},
-            nsIDOMKeyEvent.DOM_VK_9, "\u00E7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "\u00E7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_9, shift:1, chars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Numeric with ShiftLock
     testKey({layout:"French", keyCode:WIN_VK_0, capsLock:1, chars:"0"},
-            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_0, capsLock:1, shift:1, chars:"\u00E0"},
-            nsIDOMKeyEvent.DOM_VK_0, "\u00E0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "\u00E0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_1, capsLock:1, chars:"1"},
-            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_1, capsLock:1, shift:1, chars:"&"},
-            nsIDOMKeyEvent.DOM_VK_1, "&", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_1, "&", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_2, capsLock:1, chars:"2"},
-            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_2, capsLock:1, shift:1, chars:"\u00E9"},
-            nsIDOMKeyEvent.DOM_VK_2, "\u00E9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_2, "\u00E9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_3, capsLock:1, chars:"3"},
-            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_3, capsLock:1, shift:1, chars:"\""},
-            nsIDOMKeyEvent.DOM_VK_3, "\"", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "\"", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_4, capsLock:1, chars:"4"},
-            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_4, capsLock:1, shift:1, chars:"'"},
-            nsIDOMKeyEvent.DOM_VK_4, "'", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "'", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_5, capsLock:1, chars:"5"},
-            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_5, capsLock:1, shift:1, chars:"("},
-            nsIDOMKeyEvent.DOM_VK_5, "(", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "(", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_6, capsLock:1, chars:"6"},
-            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "6", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_6, capsLock:1, shift:1, chars:"-"},
-            nsIDOMKeyEvent.DOM_VK_6, "-", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "-", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_7, capsLock:1, chars:"7"},
-            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_7, capsLock:1, shift:1, chars:"\u00E8"},
-            nsIDOMKeyEvent.DOM_VK_7, "\u00E8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_7, "\u00E8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_8, capsLock:1, chars:"8"},
-            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_8, capsLock:1, shift:1, chars:"_"},
-            nsIDOMKeyEvent.DOM_VK_8, "_", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "_", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_9, capsLock:1, chars:"9"},
-            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_9, capsLock:1, shift:1, chars:"\u00E7"},
-            nsIDOMKeyEvent.DOM_VK_9, "\u00E7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "\u00E7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // OEM keys
     testKey({layout:"French", keyCode:WIN_VK_OEM_7, chars:"\u00B2"},
-            0, "\u00B2", SHOULD_DELIVER_ALL);
+            0, "\u00B2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_7, shift:1, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_4, chars:")"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, ")", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, ")", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_4, shift:1, chars:"\u00B0"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, "\u00B0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, "\u00B0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PLUS, chars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PLUS, shift:1, chars:"+"},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     //testKey({layout:"French", keyCode:WIN_VK_OEM_6, chars:""},
-    //        nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP); // Dead-key
+    //        nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key
     //testKey({layout:"French", keyCode:WIN_VK_OEM_6, shift:1, chars:""},
-    //        nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_ALL); // Dead-key
+    //        nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key
     testKey({layout:"French", keyCode:WIN_VK_OEM_1, chars:"$"},
-            nsIDOMKeyEvent.DOM_VK_DOLLAR, "$", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DOLLAR, "$", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_1, shift:1, chars:"\u00A3"},
-            nsIDOMKeyEvent.DOM_VK_DOLLAR, "\u00A3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DOLLAR, "\u00A3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_3, chars:"\u00F9"},
-            nsIDOMKeyEvent.DOM_VK_PERCENT, "\u00F9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERCENT, "\u00F9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_3, shift:1, chars:"%"},
-            nsIDOMKeyEvent.DOM_VK_PERCENT, "%", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERCENT, "%", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_5, chars:"*"},
-            nsIDOMKeyEvent.DOM_VK_ASTERISK, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ASTERISK, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_5, shift:1, chars:"\u00B5"},
-            nsIDOMKeyEvent.DOM_VK_ASTERISK, "\u00B5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ASTERISK, "\u00B5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_102, chars:"<"},
-            nsIDOMKeyEvent.DOM_VK_LESS_THAN, "<", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_LESS_THAN, "<", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_102, shift:1, chars:">"},
-            nsIDOMKeyEvent.DOM_VK_LESS_THAN, ">", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_LESS_THAN, ">", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_COMMA, chars:","},
-            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_COMMA, shift:1, chars:"?"},
-            nsIDOMKeyEvent.DOM_VK_COMMA, "?", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, "?", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PERIOD, chars:";"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PERIOD, shift:1, chars:"."},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ".", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ".", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_2, chars:":"},
-            nsIDOMKeyEvent.DOM_VK_COLON, ":", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COLON, ":", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_2, shift:1, chars:"/"},
-            nsIDOMKeyEvent.DOM_VK_COLON, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COLON, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_8, chars:"!"},
-            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "!", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "!", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_8, shift:1, chars:"\u00A7"},
-            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "\u00A7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "\u00A7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // OEM keys with ShiftLock
     testKey({layout:"French", keyCode:WIN_VK_OEM_7, capsLock:1, chars:"\u00B2"},
-            0, "\u00B2", SHOULD_DELIVER_ALL);
+            0, "\u00B2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_7, capsLock:1, shift:1, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_4, capsLock:1, chars:"\u00B0"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, "\u00B0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, "\u00B0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_4, capsLock:1, shift:1, chars:")"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, ")", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, ")", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PLUS, capsLock:1, chars:"+"},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "+", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PLUS, capsLock:1, shift:1, chars:"="},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "=", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     //testKey({layout:"French", keyCode:WIN_VK_OEM_6, capsLock:1, chars:""},
-    //        0, "", SHOULD_DELIVER_KEYDOWN_KEYUP); // Dead-key
+    //        0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key
     //testKey({layout:"French", keyCode:WIN_VK_OEM_6, capsLock:1, shift:1, chars:""},
-    //        0, "", SHOULD_DELIVER_KEYDOWN_KEYUP); // Dead-key
+    //        0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key
     testKey({layout:"French", keyCode:WIN_VK_OEM_1, capsLock:1, chars:"\u00A3"},
-            nsIDOMKeyEvent.DOM_VK_DOLLAR, "\u00A3", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DOLLAR, "\u00A3", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_1, capsLock:1, shift:1, chars:"$"},
-            nsIDOMKeyEvent.DOM_VK_DOLLAR, "$", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_DOLLAR, "$", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_3, capsLock:1, chars:"%"},
-            nsIDOMKeyEvent.DOM_VK_PERCENT, "%", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERCENT, "%", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_3, capsLock:1, shift:1, chars:"\u00F9"},
-            nsIDOMKeyEvent.DOM_VK_PERCENT, "\u00F9", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PERCENT, "\u00F9", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_5, capsLock:1, chars:"\u00B5"},
-            nsIDOMKeyEvent.DOM_VK_ASTERISK, "\u00B5", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ASTERISK, "\u00B5", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_5, capsLock:1, shift:1, chars:"*"},
-            nsIDOMKeyEvent.DOM_VK_ASTERISK, "*", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_ASTERISK, "*", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_102, capsLock:1, chars:"<"},
-            nsIDOMKeyEvent.DOM_VK_LESS_THAN, "<", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_LESS_THAN, "<", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_102, capsLock:1, shift:1, chars:">"},
-            nsIDOMKeyEvent.DOM_VK_LESS_THAN, ">", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_LESS_THAN, ">", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_COMMA, capsLock:1, chars:"?"},
-            nsIDOMKeyEvent.DOM_VK_COMMA, "?", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, "?", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_COMMA, capsLock:1, shift:1, chars:","},
-            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COMMA, ",", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PERIOD, capsLock:1, chars:"."},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ".", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ".", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PERIOD, capsLock:1, shift:1, chars:";"},
-            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_SEMICOLON, ";", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_2, capsLock:1, chars:"/"},
-            nsIDOMKeyEvent.DOM_VK_COLON, "/", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COLON, "/", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_2, capsLock:1, shift:1, chars:":"},
-            nsIDOMKeyEvent.DOM_VK_COLON, ":", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_COLON, ":", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_8, capsLock:1, chars:"\u00A7"},
-            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "\u00A7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "\u00A7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_8, capsLock:1, shift:1, chars:"!"},
-            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "!", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EXCLAMATION, "!", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // AltGr
     testKey({layout:"French", keyCode:WIN_VK_0, altGr:1, chars:"@"},
-            nsIDOMKeyEvent.DOM_VK_0, "@", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_0, "@", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_1, altGr:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_1, "&", SHOULD_DELIVER_ALL_BUT_NOT_CAUSE_INPUT);
+            nsIDOMKeyEvent.DOM_VK_1, "&", SHOULD_DELIVER_ALL_BUT_NOT_CAUSE_INPUT, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     //testKey({layout:"French", keyCode:WIN_VK_2, altGr:1, chars:""},
-    //        nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL); // Dead-key
+    //        nsIDOMKeyEvent.DOM_VK_2, "2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key
     testKey({layout:"French", keyCode:WIN_VK_3, altGr:1, chars:"#"},
-            nsIDOMKeyEvent.DOM_VK_3, "#", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_3, "#", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_4, altGr:1, chars:"{"},
-            nsIDOMKeyEvent.DOM_VK_4, "{", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_4, "{", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_5, altGr:1, chars:"["},
-            nsIDOMKeyEvent.DOM_VK_5, "[", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_5, "[", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_6, altGr:1, chars:"|"},
-            nsIDOMKeyEvent.DOM_VK_6, "|", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_6, "|", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     //testKey({layout:"French", keyCode:WIN_VK_7, altGr:1, chars:""},
-    //        nsIDOMKeyEvent.DOM_VK_7, "", SHOULD_DELIVER_ALL); // Dead-key
+    //        nsIDOMKeyEvent.DOM_VK_7, "", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD); // Dead-key
     testKey({layout:"French", keyCode:WIN_VK_8, altGr:1, chars:"\\"},
-            nsIDOMKeyEvent.DOM_VK_8, "\\", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_8, "\\", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_9, altGr:1, chars:"^"},
-            nsIDOMKeyEvent.DOM_VK_9, "^", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_9, "^", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_4, altGr:1, chars:"]"},
-            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, "]", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CLOSE_PAREN, "]", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_PLUS, altGr:1, chars:"}"},
-            nsIDOMKeyEvent.DOM_VK_EQUALS, "}", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_EQUALS, "}", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // German
     testKey({layout:"German", keyCode:WIN_VK_OEM_2, chars:"#"},
-            nsIDOMKeyEvent.DOM_VK_HASH, "#", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HASH, "#", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"German", keyCode:WIN_VK_OEM_2, shift:1, chars:"'"},
-            nsIDOMKeyEvent.DOM_VK_HASH, "'", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_HASH, "'", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Norwegian
     testKey({layout:"Norwegian", keyCode:WIN_VK_OEM_5, chars:"|"},
-            nsIDOMKeyEvent.DOM_VK_PIPE, "|", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PIPE, "|", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Norwegian", keyCode:WIN_VK_OEM_5, shift:1, chars:"\u00A7"},
-            nsIDOMKeyEvent.DOM_VK_PIPE, "\u00A7", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_PIPE, "\u00A7", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     // Dead keys on any layouts
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, chars:"^^"},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "^^", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "^^", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_A, chars:"\u00E2"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00E2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00E2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_A, shift:1, chars:"\u00C2"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00C2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00C2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_Q, chars:"^q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "^q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "^q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, shift:1, chars:"\u00A8\u00A8"},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "\u00A8\u00A8", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "\u00A8\u00A8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_A, shift:1, chars:"\u00C4"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00C4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00C4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_A, chars:"\u00E4"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00E4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00E4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"French", keyCode:WIN_VK_OEM_6, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_CIRCUMFLEX, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"French", keyCode:WIN_VK_Q, shift:1, chars:"\u00A8Q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "\u00A8Q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "\u00A8Q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, chars:"``"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "``", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "``", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, chars:"\u00E0"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00E0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00E0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, shift:1, chars:"\u00C0"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00C0", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00C0", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_Q, chars:"`q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "`q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "`q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, shift:1, chars:"^^"},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "^^", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "^^", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, shift:1, chars:"\u00C2"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00C2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00C2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, chars:"\u00E2"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00E2", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00E2", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_1, shift:1, chars:""},
-            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            nsIDOMKeyEvent.DOM_VK_BACK_QUOTE, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_Q, shift:1, chars:"^Q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "^Q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "^Q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, chars:"\u00B4\u00B4"},
-            0, "\u00B4\u00B4", SHOULD_DELIVER_ALL);
+            0, "\u00B4\u00B4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, chars:"\u00E1"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00E1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00E1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, shift:1, chars:"\u00C1"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00C1", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00C1", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_Q, chars:"\u00B4q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "\u00B4q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "\u00B4q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, shift:1, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, shift:1, chars:"\u00A8\u00A8"},
-            0, "\u00A8\u00A8", SHOULD_DELIVER_ALL);
+            0, "\u00A8\u00A8", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, shift:1, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, shift:1, chars:"\u00C4"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00C4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00C4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, shift:1, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_A, chars:"\u00E4"},
-            nsIDOMKeyEvent.DOM_VK_A, "\u00E4", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_A, "\u00E4", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
 
     testKey({layout:"Spanish", keyCode:WIN_VK_OEM_7, shift:1, chars:""},
-            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP);
+            0, "", SHOULD_DELIVER_KEYDOWN_KEYUP, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
     testKey({layout:"Spanish", keyCode:WIN_VK_Q, shift:1, chars:"\u00A8Q"},
-            nsIDOMKeyEvent.DOM_VK_Q, "\u00A8Q", SHOULD_DELIVER_ALL);
+            nsIDOMKeyEvent.DOM_VK_Q, "\u00A8Q", SHOULD_DELIVER_ALL, KeyboardEvent.DOM_KEY_LOCATION_STANDARD);
   }
 
   document.removeEventListener("keydown",  onKeyEvent, false);
diff --git a/widget/windows/KeyboardLayout.cpp b/widget/windows/KeyboardLayout.cpp
index b0d1150885a..a6047b1e693 100644
--- a/widget/windows/KeyboardLayout.cpp
+++ b/widget/windows/KeyboardLayout.cpp
@@ -386,37 +386,141 @@ NativeKey::NativeKey(const KeyboardLayout& aKeyboardLayout,
 {
   mScanCode = WinUtils::GetScanCode(aKeyOrCharMessage.lParam);
   mIsExtended = WinUtils::IsExtendedScanCode(aKeyOrCharMessage.lParam);
+  // On WinXP and WinServer2003, we cannot compute the virtual keycode for
+  // extended keys due to the API limitation.
+  bool canComputeVirtualKeyCodeFromScanCode =
+    (!mIsExtended || WinUtils::GetWindowsVersion() >= WinUtils::VISTA_VERSION);
   switch (aKeyOrCharMessage.message) {
     case WM_KEYDOWN:
     case WM_KEYUP:
     case WM_SYSKEYDOWN:
-    case WM_SYSKEYUP:
-      mOriginalVirtualKeyCode = static_cast<PRUint8>(aKeyOrCharMessage.wParam);
-      switch (aKeyOrCharMessage.wParam) {
+    case WM_SYSKEYUP: {
+      // First, resolve the IME converted virtual keycode to its original
+      // keycode.
+      if (aKeyOrCharMessage.wParam == VK_PROCESSKEY) {
+        mOriginalVirtualKeyCode = static_cast<PRUint8>(
+          ::ImmGetVirtualKey(aWindow->GetWindowHandle()));
+      } else {
+        mOriginalVirtualKeyCode =
+          static_cast<PRUint8>(aKeyOrCharMessage.wParam);
+      }
+
+      // Most keys are not distinguished as left or right keys.
+      bool isLeftRightDistinguishedKey = false;
+
+      // mOriginalVirtualKeyCode must not distinguish left or right of
+      // Shift, Control or Alt.
+      switch (mOriginalVirtualKeyCode) {
+        case VK_SHIFT:
         case VK_CONTROL:
         case VK_MENU:
-        case VK_SHIFT:
-          mVirtualKeyCode = static_cast<PRUint8>(
-            ::MapVirtualKeyEx(GetScanCodeWithExtendedFlag(),
-                              MAPVK_VSC_TO_VK_EX, aKeyboardLayout.GetLayout()));
+          isLeftRightDistinguishedKey = true;
           break;
-        case VK_PROCESSKEY:
-          mVirtualKeyCode = mOriginalVirtualKeyCode =
-            static_cast<PRUint8>(
-              ::ImmGetVirtualKey(aWindow->GetWindowHandle()));
+        case VK_LSHIFT:
+        case VK_RSHIFT:
+          mVirtualKeyCode = mOriginalVirtualKeyCode;
+          mOriginalVirtualKeyCode = VK_SHIFT;
+          isLeftRightDistinguishedKey = true;
+          break;
+        case VK_LCONTROL:
+        case VK_RCONTROL:
+          mVirtualKeyCode = mOriginalVirtualKeyCode;
+          mOriginalVirtualKeyCode = VK_CONTROL;
+          isLeftRightDistinguishedKey = true;
+          break;
+        case VK_LMENU:
+        case VK_RMENU:
+          mVirtualKeyCode = mOriginalVirtualKeyCode;
+          mOriginalVirtualKeyCode = VK_MENU;
+          isLeftRightDistinguishedKey = true;
+          break;
+      }
+
+      // If virtual keycode (left-right distinguished keycode) is already
+      // computed, we don't need to do anymore.
+      if (mVirtualKeyCode) {
+        break;
+      }
+
+      // If the keycode doesn't have LR distinguished keycode, we just set
+      // mOriginalVirtualKeyCode to mVirtualKeyCode.  Note that don't compute
+      // it from MapVirtualKeyEx() because the scan code might be wrong if
+      // the message is sent/posted by other application.  Then, we will compute
+      // unexpected keycode from the scan code.
+      if (!isLeftRightDistinguishedKey) {
+        break;
+      }
+
+      if (!canComputeVirtualKeyCodeFromScanCode) {
+        // The right control key and the right alt key are extended keys.
+        // Therefore, we never get VK_RCONTRL and VK_RMENU for the result of
+        // MapVirtualKeyEx() on WinXP or WinServer2003.
+        //
+        // If VK_CONTROL or VK_MENU key message is caused by an extended key,
+        // we should assume that the right key of them is pressed.
+        switch (mOriginalVirtualKeyCode) {
+          case VK_CONTROL:
+            mVirtualKeyCode = VK_RCONTROL;
+            break;
+          case VK_MENU:
+            mVirtualKeyCode = VK_RMENU;
+            break;
+          case VK_SHIFT:
+            // Neither left shift nor right shift is not an extended key,
+            // let's use VK_LSHIFT for invalid scan code.
+            mVirtualKeyCode = VK_LSHIFT;
+            break;
+          default:
+            MOZ_NOT_REACHED("Unsupported mOriginalVirtualKeyCode");
+            break;
+        }
+        break;
+      }
+
+      NS_ASSERTION(!mVirtualKeyCode,
+                   "mVirtualKeyCode has been computed already");
+
+      // Otherwise, compute the virtual keycode with MapVirtualKeyEx().
+      mVirtualKeyCode = static_cast<PRUint8>(
+        ::MapVirtualKeyEx(GetScanCodeWithExtendedFlag(),
+                          MAPVK_VSC_TO_VK_EX, aKeyboardLayout.GetLayout()));
+
+      // The result might be unexpected value due to the scan code is
+      // wrong.  For example, any key messages can be generated by
+      // SendMessage() or PostMessage() from applications.  So, it's possible
+      // failure.  Then, let's respect the extended flag even if it might be
+      // set intentionally.
+      switch (mOriginalVirtualKeyCode) {
+        case VK_CONTROL:
+          if (mVirtualKeyCode != VK_LCONTROL &&
+              mVirtualKeyCode != VK_RCONTROL) {
+            mVirtualKeyCode = mIsExtended ? VK_RCONTROL : VK_LCONTROL;
+          }
+          break;
+        case VK_MENU:
+          if (mVirtualKeyCode != VK_LMENU && mVirtualKeyCode != VK_RMENU) {
+            mVirtualKeyCode = mIsExtended ? VK_RMENU : VK_LMENU;
+          }
+          break;
+        case VK_SHIFT:
+          if (mVirtualKeyCode != VK_LSHIFT && mVirtualKeyCode != VK_RSHIFT) {
+            // Neither left shift nor right shift is not an extended key,
+            // let's use VK_LSHIFT for invalid scan code.
+            mVirtualKeyCode = VK_LSHIFT;
+          }
           break;
         default:
-          mVirtualKeyCode = mOriginalVirtualKeyCode;
+          MOZ_NOT_REACHED("Unsupported mOriginalVirtualKeyCode");
           break;
       }
       break;
+    }
     case WM_CHAR:
     case WM_UNICHAR:
     case WM_SYSCHAR:
       // We cannot compute the virtual key code from WM_CHAR message on WinXP
-      // and 
-      if (mIsExtended &&
-          WinUtils::GetWindowsVersion() < WinUtils::VISTA_VERSION) {
+      // if it's caused by an extended key.
+      if (!canComputeVirtualKeyCodeFromScanCode) {
         break;
       }
       mVirtualKeyCode = mOriginalVirtualKeyCode = static_cast<PRUint8>(
@@ -446,6 +550,7 @@ NativeKey::GetScanCodeWithExtendedFlag() const
   // no way to get virtual keycodes from scancode of extended keys.
   if (!mIsExtended ||
       WinUtils::GetWindowsVersion() < WinUtils::VISTA_VERSION) {
+    NS_WARNING("GetScanCodeWithExtendedFlat() returns without extended flag");
     return mScanCode;
   }
   return (0xE000 | mScanCode);
@@ -468,6 +573,7 @@ NativeKey::GetKeyLocation() const
       return nsIDOMKeyEvent::DOM_KEY_LOCATION_RIGHT;
 
     case VK_RETURN:
+      // XXX This code assumes that all keyboard drivers use same mapping.
       return !mIsExtended ? nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD :
                             nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD;
 
@@ -482,6 +588,7 @@ NativeKey::GetKeyLocation() const
     case VK_HOME:
     case VK_UP:
     case VK_PRIOR:
+      // XXX This code assumes that all keyboard drivers use same mapping.
       return mIsExtended ? nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD :
                            nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD;
 
@@ -503,6 +610,11 @@ NativeKey::GetKeyLocation() const
     case VK_ADD:
       return nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD;
 
+    case VK_SHIFT:
+    case VK_CONTROL:
+    case VK_MENU:
+      NS_WARNING("Failed to decide the key location?");
+
     default:
       return nsIDOMKeyEvent::DOM_KEY_LOCATION_STANDARD;
   }
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index 18e67b0b27a..596fe5c0f84 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -5700,11 +5700,65 @@ nsWindow::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
   HKL oldLayout = gKbdLayout.GetLayout();
   gKbdLayout.LoadLayout(loadedLayout);
 
+  PRUint8 argumentKeySpecific = 0;
+  switch (aNativeKeyCode) {
+    case VK_SHIFT:
+      aModifierFlags &= ~(nsIWidget::SHIFT_L | nsIWidget::SHIFT_R);
+      argumentKeySpecific = VK_LSHIFT;
+      break;
+    case VK_LSHIFT:
+      aModifierFlags &= ~nsIWidget::SHIFT_L;
+      argumentKeySpecific = aNativeKeyCode;
+      aNativeKeyCode = VK_SHIFT;
+      break;
+    case VK_RSHIFT:
+      aModifierFlags &= ~nsIWidget::SHIFT_R;
+      argumentKeySpecific = aNativeKeyCode;
+      aNativeKeyCode = VK_SHIFT;
+      break;
+    case VK_CONTROL:
+      aModifierFlags &= ~(nsIWidget::CTRL_L | nsIWidget::CTRL_R);
+      argumentKeySpecific = VK_LCONTROL;
+      break;
+    case VK_LCONTROL:
+      aModifierFlags &= ~nsIWidget::CTRL_L;
+      argumentKeySpecific = aNativeKeyCode;
+      aNativeKeyCode = VK_CONTROL;
+      break;
+    case VK_RCONTROL:
+      aModifierFlags &= ~nsIWidget::CTRL_R;
+      argumentKeySpecific = aNativeKeyCode;
+      aNativeKeyCode = VK_CONTROL;
+      break;
+    case VK_MENU:
+      aModifierFlags &= ~(nsIWidget::ALT_L | nsIWidget::ALT_R);
+      argumentKeySpecific = VK_LMENU;
+      break;
+    case VK_LMENU:
+      aModifierFlags &= ~nsIWidget::ALT_L;
+      argumentKeySpecific = aNativeKeyCode;
+      aNativeKeyCode = VK_MENU;
+      break;
+    case VK_RMENU:
+      aModifierFlags &= ~nsIWidget::ALT_R;
+      argumentKeySpecific = aNativeKeyCode;
+      aNativeKeyCode = VK_MENU;
+      break;
+    case VK_CAPITAL:
+      aModifierFlags &= ~nsIWidget::CAPS_LOCK;
+      argumentKeySpecific = VK_CAPITAL;
+      break;
+    case VK_NUMLOCK:
+      aModifierFlags &= ~nsIWidget::NUM_LOCK;
+      argumentKeySpecific = VK_NUMLOCK;
+      break;
+  }
+
   nsAutoTArray<KeyPair,10> keySequence;
   SetupKeyModifiersSequence(&keySequence, aModifierFlags);
   NS_ASSERTION(aNativeKeyCode >= 0 && aNativeKeyCode < 256,
                "Native VK key code out of range");
-  keySequence.AppendElement(KeyPair(aNativeKeyCode, 0));
+  keySequence.AppendElement(KeyPair(aNativeKeyCode, argumentKeySpecific));
 
   // Simulate the pressing of each modifier key and then the real key
   for (PRUint32 i = 0; i < keySequence.Length(); ++i) {
@@ -5716,8 +5770,9 @@ nsWindow::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
     }
     ::SetKeyboardState(kbdState);
     ModifierKeyState modKeyState;
-    UINT scanCode = ::MapVirtualKeyEx(aNativeKeyCode, MAPVK_VK_TO_VSC,
-                                      gKbdLayout.GetLayout());
+    UINT scanCode = ::MapVirtualKeyEx(argumentKeySpecific ?
+                                        argumentKeySpecific : aNativeKeyCode,
+                                      MAPVK_VK_TO_VSC, gKbdLayout.GetLayout());
     LPARAM lParam = static_cast<LPARAM>(scanCode << 16);
     // Add extended key flag to the lParam for right control key and right alt
     // key.
@@ -5762,8 +5817,9 @@ nsWindow::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
     }
     ::SetKeyboardState(kbdState);
     ModifierKeyState modKeyState;
-    UINT scanCode = ::MapVirtualKeyEx(aNativeKeyCode, MAPVK_VK_TO_VSC,
-                                      gKbdLayout.GetLayout());
+    UINT scanCode = ::MapVirtualKeyEx(argumentKeySpecific ?
+                                        argumentKeySpecific : aNativeKeyCode,
+                                      MAPVK_VK_TO_VSC, gKbdLayout.GetLayout());
     LPARAM lParam = static_cast<LPARAM>(scanCode << 16);
     // Add extended key flag to the lParam for right control key and right alt
     // key.

From 1f182688f12acd1e684a0fc610fdd3ae641b5df2 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 18 Jul 2012 17:38:10 -0700
Subject: [PATCH 100/118] Bug 647367 - Sequester jshash.{h,cpp} in js/jsd/. 
 r=luke.

--HG--
rename : js/src/jshash.cpp => js/jsd/jshash.cpp
rename : js/src/jshash.h => js/jsd/jshash.h
extra : rebase_source : 22311241bc356e2c724c28f4199cfa8008d594a9
---
 js/jsd/Makefile.in           |  4 +++-
 js/{src => jsd}/jshash.cpp   |  0
 js/{src => jsd}/jshash.h     |  0
 js/src/Makefile.in           |  2 --
 js/src/jsatom.cpp            |  7 -------
 js/src/jsatom.h              | 25 ++++---------------------
 js/src/jsgc.cpp              |  1 -
 js/src/jsobj.cpp             |  1 -
 js/src/jsobj.h               |  1 -
 js/src/jsscope.cpp           |  3 ++-
 js/src/jsscript.h            |  2 +-
 js/src/jsstr.cpp             |  2 +-
 js/src/jstypedarray.cpp      |  1 -
 js/xpconnect/src/XPCMaps.cpp | 12 ++++++------
 mfbt/HashFunctions.h         |  8 ++++++++
 15 files changed, 25 insertions(+), 44 deletions(-)
 rename js/{src => jsd}/jshash.cpp (100%)
 rename js/{src => jsd}/jshash.h (100%)

diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 856f56081ec..287d9496eba 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -17,7 +17,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= jsdebug
 LIBRARY_NAME	= jsd
 DIRS	= idl
-CPPSRCS	 = jsd_xpc.cpp
+CPPSRCS	 = \
+		jsd_xpc.cpp \
+		jshash.cpp
 IS_COMPONENT = 1
 LIBXUL_LIBRARY = 1
 
diff --git a/js/src/jshash.cpp b/js/jsd/jshash.cpp
similarity index 100%
rename from js/src/jshash.cpp
rename to js/jsd/jshash.cpp
diff --git a/js/src/jshash.h b/js/jsd/jshash.h
similarity index 100%
rename from js/src/jshash.h
rename to js/jsd/jshash.h
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 29e5695e568..99f51d03dbb 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -82,7 +82,6 @@ CPPSRCS		= \
 		jsfun.cpp \
 		jsgc.cpp \
 		jscrashreport.cpp \
-		jshash.cpp \
 		jsinfer.cpp \
 		jsinterp.cpp \
 		jsiter.cpp \
@@ -161,7 +160,6 @@ INSTALLED_HEADERS = \
 		jsdhash.h \
 		jsfriendapi.h \
 		jsgc.h \
-		jshash.h \
 		jslock.h \
 		json.h \
 		jsproxy.h \
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index e722c9b5ac5..ff70ca607a0 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -15,7 +15,6 @@
 
 #include "jstypes.h"
 #include "jsutil.h"
-#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsatom.h"
@@ -43,12 +42,6 @@ using namespace js::gc;
 
 const size_t JSAtomState::commonAtomsOffset = offsetof(JSAtomState, emptyAtom);
 
-/*
- * ATOM_HASH assumes that JSHashNumber is 32-bit even on 64-bit systems.
- */
-JS_STATIC_ASSERT(sizeof(JSHashNumber) == 4);
-JS_STATIC_ASSERT(sizeof(JSAtom *) == JS_BYTES_PER_WORD);
-
 const char *
 js_AtomToPrintableString(JSContext *cx, JSAtom *atom, JSAutoByteString *bytes)
 {
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index a3447e06b40..7c9a947016f 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -12,12 +12,12 @@
 #include "jsalloc.h"
 #include "jsapi.h"
 #include "jsprvtd.h"
-#include "jshash.h"
 #include "jspubtd.h"
 #include "jslock.h"
 
 #include "gc/Barrier.h"
 #include "js/HashTable.h"
+#include "mozilla/HashFunctions.h"
 
 struct JSIdArray {
     int length;
@@ -83,23 +83,15 @@ JSID_TO_ATOM(jsid id)
     return (JSAtom *)JSID_TO_STRING(id);
 }
 
-JS_STATIC_ASSERT(sizeof(JSHashNumber) == 4);
+JS_STATIC_ASSERT(sizeof(js::HashNumber) == 4);
 JS_STATIC_ASSERT(sizeof(jsid) == JS_BYTES_PER_WORD);
 
 namespace js {
 
-static JS_ALWAYS_INLINE JSHashNumber
+static JS_ALWAYS_INLINE js::HashNumber
 HashId(jsid id)
 {
-    JSHashNumber n =
-#if JS_BYTES_PER_WORD == 4
-        JSHashNumber(JSID_BITS(id));
-#elif JS_BYTES_PER_WORD == 8
-        JSHashNumber(JSID_BITS(id)) ^ JSHashNumber(JSID_BITS(id) >> 32);
-#else
-# error "Unsupported configuration"
-#endif
-    return n * JS_GOLDEN_RATIO;
+    return HashGeneric(JSID_BITS(id));
 }
 
 static JS_ALWAYS_INLINE Value
@@ -135,15 +127,6 @@ struct DefaultHasher<jsid>
 
 }
 
-#if JS_BYTES_PER_WORD == 4
-# define ATOM_HASH(atom)          ((JSHashNumber)(atom) >> 2)
-#elif JS_BYTES_PER_WORD == 8
-# define ATOM_HASH(atom)          (((JSHashNumber)(uintptr_t)(atom) >> 3) ^   \
-                                   (JSHashNumber)((uintptr_t)(atom) >> 32))
-#else
-# error "Unsupported configuration"
-#endif
-
 /*
  * Return a printable, lossless char[] representation of a string-type atom.
  * The lifetime of the result matches the lifetime of bytes.
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index c6806f3deb2..b1b0cc24663 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -44,7 +44,6 @@
 
 #include "jstypes.h"
 #include "jsutil.h"
-#include "jshash.h"
 #include "jsclist.h"
 #include "jsprf.h"
 #include "jsapi.h"
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index b9b1c111548..1bb11818515 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -15,7 +15,6 @@
 
 #include "jstypes.h"
 #include "jsutil.h"
-#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsarray.h"
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index c6ba24e15f7..4a8c9345320 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -21,7 +21,6 @@
 #include "jsclass.h"
 #include "jsfriendapi.h"
 #include "jsinfer.h"
-#include "jshash.h"
 #include "jspubtd.h"
 #include "jsprvtd.h"
 #include "jslock.h"
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 00d13f92c5e..5d66dbf3e67 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -24,6 +24,7 @@
 #include "jsscope.h"
 #include "jsstr.h"
 
+#include "js/HashTable.h"
 #include "js/MemoryMetrics.h"
 
 #include "jsatominlines.h"
@@ -145,7 +146,7 @@ Shape::hashify(JSContext *cx)
 Shape **
 ShapeTable::search(jsid id, bool adding)
 {
-    JSHashNumber hash0, hash1, hash2;
+    js::HashNumber hash0, hash1, hash2;
     int sizeLog2;
     Shape *stored, *shape, **spp, **firstRemoved;
     uint32_t sizeMask;
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index ab5f8cebad1..95300a69e9c 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -955,7 +955,7 @@ struct ScriptFilenameEntry
 struct ScriptFilenameHasher
 {
     typedef const char *Lookup;
-    static HashNumber hash(const char *l) { return JS_HashString(l); }
+    static HashNumber hash(const char *l) { return mozilla::HashString(l); }
     static bool match(const ScriptFilenameEntry *e, const char *l) {
         return strcmp(e->filename, l) == 0;
     }
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 248f9c62871..93651f61af5 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -23,7 +23,6 @@
 #include <string.h>
 #include "jstypes.h"
 #include "jsutil.h"
-#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsarray.h"
@@ -42,6 +41,7 @@
 #include "jsversion.h"
 
 #include "builtin/RegExp.h"
+#include "js/HashTable.h"
 #include "vm/GlobalObject.h"
 #include "vm/NumericConversions.h"
 #include "vm/RegExpObject.h"
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 8f583d5cba3..9fb9e8136f5 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -9,7 +9,6 @@
 #include "mozilla/FloatingPoint.h"
 #include "jstypes.h"
 #include "jsutil.h"
-#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsarray.h"
diff --git a/js/xpconnect/src/XPCMaps.cpp b/js/xpconnect/src/XPCMaps.cpp
index 5309f2a284b..a68b54d6a98 100644
--- a/js/xpconnect/src/XPCMaps.cpp
+++ b/js/xpconnect/src/XPCMaps.cpp
@@ -8,7 +8,7 @@
 
 #include "xpcprivate.h"
 
-#include "jshash.h"
+#include "js/HashTable.h"
 
 /***************************************************************************/
 // static shared...
@@ -19,7 +19,7 @@
 static JSDHashNumber
 HashIIDPtrKey(JSDHashTable *table, const void *key)
 {
-    return *((JSHashNumber*)key);
+    return *((js::HashNumber*)key);
 }
 
 static JSBool
@@ -56,7 +56,7 @@ HashNativeKey(JSDHashTable *table, const void *key)
         NS_ASSERTION(Addition, "bad key");
         // This would be an XOR like below.
         // But "0 ^ x == x". So it does not matter.
-        h = (JSHashNumber) NS_PTR_TO_INT32(Addition) >> 2;
+        h = (js::HashNumber) NS_PTR_TO_INT32(Addition) >> 2;
     } else {
         XPCNativeInterface** Current = Set->GetInterfaceArray();
         PRUint16 count = Set->GetInterfaceCount();
@@ -64,13 +64,13 @@ HashNativeKey(JSDHashTable *table, const void *key)
             count++;
             for (PRUint16 i = 0; i < count; i++) {
                 if (i == Position)
-                    h ^= (JSHashNumber) NS_PTR_TO_INT32(Addition) >> 2;
+                    h ^= (js::HashNumber) NS_PTR_TO_INT32(Addition) >> 2;
                 else
-                    h ^= (JSHashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
+                    h ^= (js::HashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
             }
         } else {
             for (PRUint16 i = 0; i < count; i++)
-                h ^= (JSHashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
+                h ^= (js::HashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
         }
     }
 
diff --git a/mfbt/HashFunctions.h b/mfbt/HashFunctions.h
index 7a19749e556..badfc3c8086 100644
--- a/mfbt/HashFunctions.h
+++ b/mfbt/HashFunctions.h
@@ -179,6 +179,14 @@ AddToHash(uint32_t hash, A* a)
   return detail::AddUintptrToHash<sizeof(uintptr_t)>(hash, uintptr_t(a));
 }
 
+template<>
+MOZ_WARN_UNUSED_RESULT
+inline uint32_t
+AddToHash(uint32_t hash, uintptr_t a)
+{
+  return detail::AddUintptrToHash<sizeof(uintptr_t)>(hash, a);
+}
+
 template<typename A, typename B>
 MOZ_WARN_UNUSED_RESULT
 uint32_t

From 83d7dc0ba099db81f6b5efb1600de8c96165b9a9 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 18 Jul 2012 22:31:06 -0400
Subject: [PATCH 101/118] Backout 61d052e202c8 (bug 647367) due to Windows
 bustage.


From 1289c5333c3a363de11c1f3b390f2fca134c419c Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 18 Jul 2012 22:33:41 -0400
Subject: [PATCH 102/118] Backout 61d052e202c8 (bug 647367) due to Windows
 bustage.

---
 js/jsd/Makefile.in           |  4 +---
 js/src/Makefile.in           |  2 ++
 js/src/jsatom.cpp            |  7 +++++++
 js/src/jsatom.h              | 25 +++++++++++++++++++++----
 js/src/jsgc.cpp              |  1 +
 js/{jsd => src}/jshash.cpp   |  0
 js/{jsd => src}/jshash.h     |  0
 js/src/jsobj.cpp             |  1 +
 js/src/jsobj.h               |  1 +
 js/src/jsscope.cpp           |  3 +--
 js/src/jsscript.h            |  2 +-
 js/src/jsstr.cpp             |  2 +-
 js/src/jstypedarray.cpp      |  1 +
 js/xpconnect/src/XPCMaps.cpp | 12 ++++++------
 mfbt/HashFunctions.h         |  8 --------
 15 files changed, 44 insertions(+), 25 deletions(-)
 rename js/{jsd => src}/jshash.cpp (100%)
 rename js/{jsd => src}/jshash.h (100%)

diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in
index 287d9496eba..856f56081ec 100644
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -17,9 +17,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= jsdebug
 LIBRARY_NAME	= jsd
 DIRS	= idl
-CPPSRCS	 = \
-		jsd_xpc.cpp \
-		jshash.cpp
+CPPSRCS	 = jsd_xpc.cpp
 IS_COMPONENT = 1
 LIBXUL_LIBRARY = 1
 
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 99f51d03dbb..29e5695e568 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -82,6 +82,7 @@ CPPSRCS		= \
 		jsfun.cpp \
 		jsgc.cpp \
 		jscrashreport.cpp \
+		jshash.cpp \
 		jsinfer.cpp \
 		jsinterp.cpp \
 		jsiter.cpp \
@@ -160,6 +161,7 @@ INSTALLED_HEADERS = \
 		jsdhash.h \
 		jsfriendapi.h \
 		jsgc.h \
+		jshash.h \
 		jslock.h \
 		json.h \
 		jsproxy.h \
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index ff70ca607a0..e722c9b5ac5 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -15,6 +15,7 @@
 
 #include "jstypes.h"
 #include "jsutil.h"
+#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsatom.h"
@@ -42,6 +43,12 @@ using namespace js::gc;
 
 const size_t JSAtomState::commonAtomsOffset = offsetof(JSAtomState, emptyAtom);
 
+/*
+ * ATOM_HASH assumes that JSHashNumber is 32-bit even on 64-bit systems.
+ */
+JS_STATIC_ASSERT(sizeof(JSHashNumber) == 4);
+JS_STATIC_ASSERT(sizeof(JSAtom *) == JS_BYTES_PER_WORD);
+
 const char *
 js_AtomToPrintableString(JSContext *cx, JSAtom *atom, JSAutoByteString *bytes)
 {
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index 7c9a947016f..a3447e06b40 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -12,12 +12,12 @@
 #include "jsalloc.h"
 #include "jsapi.h"
 #include "jsprvtd.h"
+#include "jshash.h"
 #include "jspubtd.h"
 #include "jslock.h"
 
 #include "gc/Barrier.h"
 #include "js/HashTable.h"
-#include "mozilla/HashFunctions.h"
 
 struct JSIdArray {
     int length;
@@ -83,15 +83,23 @@ JSID_TO_ATOM(jsid id)
     return (JSAtom *)JSID_TO_STRING(id);
 }
 
-JS_STATIC_ASSERT(sizeof(js::HashNumber) == 4);
+JS_STATIC_ASSERT(sizeof(JSHashNumber) == 4);
 JS_STATIC_ASSERT(sizeof(jsid) == JS_BYTES_PER_WORD);
 
 namespace js {
 
-static JS_ALWAYS_INLINE js::HashNumber
+static JS_ALWAYS_INLINE JSHashNumber
 HashId(jsid id)
 {
-    return HashGeneric(JSID_BITS(id));
+    JSHashNumber n =
+#if JS_BYTES_PER_WORD == 4
+        JSHashNumber(JSID_BITS(id));
+#elif JS_BYTES_PER_WORD == 8
+        JSHashNumber(JSID_BITS(id)) ^ JSHashNumber(JSID_BITS(id) >> 32);
+#else
+# error "Unsupported configuration"
+#endif
+    return n * JS_GOLDEN_RATIO;
 }
 
 static JS_ALWAYS_INLINE Value
@@ -127,6 +135,15 @@ struct DefaultHasher<jsid>
 
 }
 
+#if JS_BYTES_PER_WORD == 4
+# define ATOM_HASH(atom)          ((JSHashNumber)(atom) >> 2)
+#elif JS_BYTES_PER_WORD == 8
+# define ATOM_HASH(atom)          (((JSHashNumber)(uintptr_t)(atom) >> 3) ^   \
+                                   (JSHashNumber)((uintptr_t)(atom) >> 32))
+#else
+# error "Unsupported configuration"
+#endif
+
 /*
  * Return a printable, lossless char[] representation of a string-type atom.
  * The lifetime of the result matches the lifetime of bytes.
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index b1b0cc24663..c6806f3deb2 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -44,6 +44,7 @@
 
 #include "jstypes.h"
 #include "jsutil.h"
+#include "jshash.h"
 #include "jsclist.h"
 #include "jsprf.h"
 #include "jsapi.h"
diff --git a/js/jsd/jshash.cpp b/js/src/jshash.cpp
similarity index 100%
rename from js/jsd/jshash.cpp
rename to js/src/jshash.cpp
diff --git a/js/jsd/jshash.h b/js/src/jshash.h
similarity index 100%
rename from js/jsd/jshash.h
rename to js/src/jshash.h
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 1bb11818515..b9b1c111548 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -15,6 +15,7 @@
 
 #include "jstypes.h"
 #include "jsutil.h"
+#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsarray.h"
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 4a8c9345320..c6ba24e15f7 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -21,6 +21,7 @@
 #include "jsclass.h"
 #include "jsfriendapi.h"
 #include "jsinfer.h"
+#include "jshash.h"
 #include "jspubtd.h"
 #include "jsprvtd.h"
 #include "jslock.h"
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 5d66dbf3e67..00d13f92c5e 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -24,7 +24,6 @@
 #include "jsscope.h"
 #include "jsstr.h"
 
-#include "js/HashTable.h"
 #include "js/MemoryMetrics.h"
 
 #include "jsatominlines.h"
@@ -146,7 +145,7 @@ Shape::hashify(JSContext *cx)
 Shape **
 ShapeTable::search(jsid id, bool adding)
 {
-    js::HashNumber hash0, hash1, hash2;
+    JSHashNumber hash0, hash1, hash2;
     int sizeLog2;
     Shape *stored, *shape, **spp, **firstRemoved;
     uint32_t sizeMask;
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index 95300a69e9c..ab5f8cebad1 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -955,7 +955,7 @@ struct ScriptFilenameEntry
 struct ScriptFilenameHasher
 {
     typedef const char *Lookup;
-    static HashNumber hash(const char *l) { return mozilla::HashString(l); }
+    static HashNumber hash(const char *l) { return JS_HashString(l); }
     static bool match(const ScriptFilenameEntry *e, const char *l) {
         return strcmp(e->filename, l) == 0;
     }
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 93651f61af5..248f9c62871 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -23,6 +23,7 @@
 #include <string.h>
 #include "jstypes.h"
 #include "jsutil.h"
+#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsarray.h"
@@ -41,7 +42,6 @@
 #include "jsversion.h"
 
 #include "builtin/RegExp.h"
-#include "js/HashTable.h"
 #include "vm/GlobalObject.h"
 #include "vm/NumericConversions.h"
 #include "vm/RegExpObject.h"
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 9fb9e8136f5..8f583d5cba3 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -9,6 +9,7 @@
 #include "mozilla/FloatingPoint.h"
 #include "jstypes.h"
 #include "jsutil.h"
+#include "jshash.h"
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jsarray.h"
diff --git a/js/xpconnect/src/XPCMaps.cpp b/js/xpconnect/src/XPCMaps.cpp
index a68b54d6a98..5309f2a284b 100644
--- a/js/xpconnect/src/XPCMaps.cpp
+++ b/js/xpconnect/src/XPCMaps.cpp
@@ -8,7 +8,7 @@
 
 #include "xpcprivate.h"
 
-#include "js/HashTable.h"
+#include "jshash.h"
 
 /***************************************************************************/
 // static shared...
@@ -19,7 +19,7 @@
 static JSDHashNumber
 HashIIDPtrKey(JSDHashTable *table, const void *key)
 {
-    return *((js::HashNumber*)key);
+    return *((JSHashNumber*)key);
 }
 
 static JSBool
@@ -56,7 +56,7 @@ HashNativeKey(JSDHashTable *table, const void *key)
         NS_ASSERTION(Addition, "bad key");
         // This would be an XOR like below.
         // But "0 ^ x == x". So it does not matter.
-        h = (js::HashNumber) NS_PTR_TO_INT32(Addition) >> 2;
+        h = (JSHashNumber) NS_PTR_TO_INT32(Addition) >> 2;
     } else {
         XPCNativeInterface** Current = Set->GetInterfaceArray();
         PRUint16 count = Set->GetInterfaceCount();
@@ -64,13 +64,13 @@ HashNativeKey(JSDHashTable *table, const void *key)
             count++;
             for (PRUint16 i = 0; i < count; i++) {
                 if (i == Position)
-                    h ^= (js::HashNumber) NS_PTR_TO_INT32(Addition) >> 2;
+                    h ^= (JSHashNumber) NS_PTR_TO_INT32(Addition) >> 2;
                 else
-                    h ^= (js::HashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
+                    h ^= (JSHashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
             }
         } else {
             for (PRUint16 i = 0; i < count; i++)
-                h ^= (js::HashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
+                h ^= (JSHashNumber) NS_PTR_TO_INT32(*(Current++)) >> 2;
         }
     }
 
diff --git a/mfbt/HashFunctions.h b/mfbt/HashFunctions.h
index badfc3c8086..7a19749e556 100644
--- a/mfbt/HashFunctions.h
+++ b/mfbt/HashFunctions.h
@@ -179,14 +179,6 @@ AddToHash(uint32_t hash, A* a)
   return detail::AddUintptrToHash<sizeof(uintptr_t)>(hash, uintptr_t(a));
 }
 
-template<>
-MOZ_WARN_UNUSED_RESULT
-inline uint32_t
-AddToHash(uint32_t hash, uintptr_t a)
-{
-  return detail::AddUintptrToHash<sizeof(uintptr_t)>(hash, a);
-}
-
 template<typename A, typename B>
 MOZ_WARN_UNUSED_RESULT
 uint32_t

From d0968d69ef58b12a4a5d9aeb814086bee7068ebc Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall@mozilla.com>
Date: Thu, 19 Jul 2012 11:26:49 +0800
Subject: [PATCH 103/118] Bug 736710 - Part 1: Voicemail API IDLs. sr=sicking

---
 dom/system/gonk/nsIRadioInterfaceLayer.idl | 20 ++++++++-
 dom/telephony/nsIDOMNavigatorTelephony.idl |  4 +-
 dom/telephony/nsIDOMVoicemail.idl          | 23 ++++++++++
 dom/telephony/nsIDOMVoicemailEvent.idl     | 18 ++++++++
 dom/telephony/nsIDOMVoicemailStatus.idl    | 50 ++++++++++++++++++++++
 5 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 dom/telephony/nsIDOMVoicemail.idl
 create mode 100644 dom/telephony/nsIDOMVoicemailEvent.idl
 create mode 100644 dom/telephony/nsIDOMVoicemailStatus.idl

diff --git a/dom/system/gonk/nsIRadioInterfaceLayer.idl b/dom/system/gonk/nsIRadioInterfaceLayer.idl
index 3c11d41b95e..f61ebcc3a33 100644
--- a/dom/system/gonk/nsIRadioInterfaceLayer.idl
+++ b/dom/system/gonk/nsIRadioInterfaceLayer.idl
@@ -8,6 +8,7 @@
 interface nsIDOMMozMobileConnectionInfo;
 interface nsIDOMDOMRequest;
 interface nsIDOMWindow;
+interface nsIDOMMozVoicemailStatus;
 
 [scriptable, uuid(c14c71b8-afba-403b-8320-94593de9380f)]
 interface nsIRILTelephonyCallback : nsISupports
@@ -62,6 +63,18 @@ interface nsIRILTelephonyCallback : nsISupports
                    in AString error);
 };
 
+[scriptable, uuid(3ac98987-a63c-4ebe-adbd-ff7a0348d804)]
+interface nsIRILVoicemailCallback : nsISupports
+{
+  /**
+   * Called when a voicemail notification has been received by the network.
+   *
+   * @param status
+   *        The new voicemail status
+   */
+  void voicemailNotification(in nsIDOMMozVoicemailStatus status);
+};
+
 [scriptable, uuid(8a711703-1ee5-4675-9d9a-0b188e944cfe)]
 interface nsIRILDataCallInfo : nsISupports
 {
@@ -117,12 +130,15 @@ interface nsIRILContactCallback : nsISupports
  * Helper that runs in the content process and exposes information
  * to the DOM.
  */
-[scriptable, uuid(2f8b0929-2ecf-498c-bfa7-42690509696e)]
+[scriptable, uuid(d2ec602f-9746-4ada-b0c6-f1c1a3cf3578)]
 interface nsIRILContentHelper : nsIMobileConnectionProvider
 {
   void registerTelephonyCallback(in nsIRILTelephonyCallback callback);
   void unregisterTelephonyCallback(in nsIRILTelephonyCallback callback);
 
+  void registerVoicemailCallback(in nsIRILVoicemailCallback callback);
+  void unregisterVoicemailCallback(in nsIRILVoicemailCallback callback);
+
   /**
    * Will continue calling callback.enumerateCallState until the callback
    * returns false.
@@ -145,6 +161,8 @@ interface nsIRILContentHelper : nsIMobileConnectionProvider
 
   attribute bool microphoneMuted;
   attribute bool speakerEnabled;
+
+  readonly attribute nsIDOMMozVoicemailStatus voicemailStatus;
 };
 
 [scriptable, uuid(fd9e8b38-b839-4d56-8482-3bf1f5c8f2ee)]
diff --git a/dom/telephony/nsIDOMNavigatorTelephony.idl b/dom/telephony/nsIDOMNavigatorTelephony.idl
index 954a66c8ce6..3bcefefa484 100644
--- a/dom/telephony/nsIDOMNavigatorTelephony.idl
+++ b/dom/telephony/nsIDOMNavigatorTelephony.idl
@@ -7,9 +7,11 @@
 #include "nsISupports.idl"
 
 interface nsIDOMTelephony;
+interface nsIDOMMozVoicemail;
 
-[scriptable, builtinclass, uuid(fb2f5927-41ea-442a-8292-81074f69dc41)]
+[scriptable, builtinclass, uuid(4a297d39-2730-47b8-b406-666b3737aacb)]
 interface nsIDOMNavigatorTelephony : nsISupports
 {
   readonly attribute nsIDOMTelephony mozTelephony;
+  readonly attribute nsIDOMMozVoicemail mozVoicemail;
 };
diff --git a/dom/telephony/nsIDOMVoicemail.idl b/dom/telephony/nsIDOMVoicemail.idl
new file mode 100644
index 00000000000..71d300016a5
--- /dev/null
+++ b/dom/telephony/nsIDOMVoicemail.idl
@@ -0,0 +1,23 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=40: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsIDOMEventTarget.idl"
+
+interface nsIDOMMozVoicemailStatus;
+
+[scriptable, builtinclass, uuid(db5b727a-daf2-40b9-83e4-cc110eab44ca)]
+interface nsIDOMMozVoicemail : nsIDOMEventTarget
+{
+  /**
+   * The current voicemail status, or null when the status is unknown
+   */
+  readonly attribute nsIDOMMozVoicemailStatus status;
+
+  /**
+   * The current voicemail status has changed
+   */
+  attribute nsIDOMEventListener onstatuschanged;
+};
diff --git a/dom/telephony/nsIDOMVoicemailEvent.idl b/dom/telephony/nsIDOMVoicemailEvent.idl
new file mode 100644
index 00000000000..d5edba3d940
--- /dev/null
+++ b/dom/telephony/nsIDOMVoicemailEvent.idl
@@ -0,0 +1,18 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=40: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsIDOMEvent.idl"
+
+interface nsIDOMMozVoicemailStatus;
+
+[scriptable, builtinclass, uuid(4642f196-1a30-4a9b-986f-7f1574d5cee1)]
+interface nsIDOMMozVoicemailEvent : nsIDOMEvent
+{
+  /**
+   * The voicemail status that caused this event to fire
+   */
+  readonly attribute nsIDOMMozVoicemailStatus status;
+};
diff --git a/dom/telephony/nsIDOMVoicemailStatus.idl b/dom/telephony/nsIDOMVoicemailStatus.idl
new file mode 100644
index 00000000000..ef391d92e9b
--- /dev/null
+++ b/dom/telephony/nsIDOMVoicemailStatus.idl
@@ -0,0 +1,50 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=40: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(8c58859a-e006-466a-ad76-b188ba0918ab)]
+interface nsIDOMMozVoicemailStatus : nsISupports
+{
+  /**
+   * There are voicemail messages waiting, but the count is unknown.
+   */
+  const long MESSAGE_COUNT_UNKNOWN = -1;
+
+  /**
+   * Whether or not there are messages waiting in the voicemail box
+   */
+  readonly attribute boolean hasMessages;
+
+  /**
+   * The total message count. Some voicemail indicators will only specify that
+   * messages are waiting, but not the actual number. In that case, the value
+   * of messageCount will be MESSAGE_COUNT_UNKNOWN (-1).
+   *
+   * Logic for a voicemail notification might look something like:
+   * if (status.hasMessages) {
+   *   // show new voicemail notification
+   *   if (status.messageCount > 0) {
+   *     // add a label for the message count
+   *   }
+   * } else {
+   *   // hide the voicemail notification
+   * }
+   */
+  readonly attribute long messageCount;
+
+  /**
+   * Return call number received for this voicemail status, or null if one
+   * wasn't provided.
+   */
+  readonly attribute DOMString returnNumber;
+
+  /**
+   * Displayable return call message received for this voicemail status, or null
+   * if one wasn't provided.
+   */
+  readonly attribute DOMString returnMessage;
+};

From 2dbd17493f7a714897a5ef522c7bf33a10478cb0 Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall@mozilla.com>
Date: Thu, 19 Jul 2012 11:27:08 +0800
Subject: [PATCH 104/118] Bug 736710 - Part 2: RIL implementation of SMS
 Message Waiting Indicator. r=vicamo

---
 dom/system/gonk/RILContentHelper.js    | 136 +++++++++++++++++++-----
 dom/system/gonk/RadioInterfaceLayer.js |  14 +++
 dom/system/gonk/ril_consts.js          |  36 +++++--
 dom/system/gonk/ril_worker.js          | 141 ++++++++++++++++++++++---
 4 files changed, 275 insertions(+), 52 deletions(-)

diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js
index 996ab147074..38edb268bbd 100644
--- a/dom/system/gonk/RILContentHelper.js
+++ b/dom/system/gonk/RILContentHelper.js
@@ -22,6 +22,8 @@ const MOBILECONNECTIONINFO_CID =
   Components.ID("{a35cfd39-2d93-4489-ac7d-396475dacb27}");
 const MOBILENETWORKINFO_CID =
   Components.ID("{a6c8416c-09b4-46d1-bf29-6520d677d085}");
+const VOICEMAILSTATUS_CID=
+  Components.ID("{5467f2eb-e214-43ea-9b89-67711241ec8e}");
 
 const RIL_IPC_MSG_NAMES = [
   "RIL:CardStateChanged",
@@ -33,6 +35,7 @@ const RIL_IPC_MSG_NAMES = [
   "RIL:SelectNetwork",
   "RIL:SelectNetworkAuto",
   "RIL:CallStateChanged",
+  "RIL:VoicemailNotification",
   "RIL:CallError",
   "RIL:GetCardLock:Return:OK",
   "RIL:GetCardLock:Return:KO",
@@ -98,6 +101,25 @@ MobileNetworkInfo.prototype = {
   state: null
 };
 
+function VoicemailStatus() {}
+VoicemailStatus.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDOMMozVoicemailStatus]),
+  classID:        VOICEMAILSTATUS_CID,
+  classInfo:      XPCOMUtils.generateCI({
+    classID:          VOICEMAILSTATUS_CID,
+    classDescription: "VoicemailStatus",
+    flags:            Ci.nsIClassInfo.DOM_OBJECT,
+    interfaces:       [Ci.nsIDOMMozVoicemailStatus]
+  }),
+
+  // nsIDOMMozVoicemailStatus
+
+  hasMessages: false,
+  messageCount: Ci.nsIDOMMozVoicemailStatus.MESSAGE_COUNT_UNKNOWN,
+  returnNumber: null,
+  returnMessage: null
+};
+
 function RILContentHelper() {
   this.voiceConnectionInfo = new MobileConnectionInfo();
   this.dataConnectionInfo = new MobileConnectionInfo();
@@ -312,31 +334,54 @@ RILContentHelper.prototype = {
   },
 
   _telephonyCallbacks: null,
-  _enumerationTelephonyCallbacks: null,
+  _voicemailCallbacks: null,
+  _enumerateTelephonyCallbacks: null,
 
-  registerTelephonyCallback: function registerTelephonyCallback(callback) {
-    if (this._telephonyCallbacks) {
-      if (this._telephonyCallbacks.indexOf(callback) != -1) {
-        throw new Error("Already registered this callback!");
-      }
-    } else {
-      this._telephonyCallbacks = [];
+  voicemailStatus: null,
+
+  registerCallback: function registerCallback(callbackType, callback) {
+    let callbacks = this[callbackType];
+    if (!callbacks) {
+      callbacks = this[callbackType] = [];
     }
-    this._telephonyCallbacks.push(callback);
-    debug("Registered telephony callback: " + callback);
+
+    if (callbacks.indexOf(callback) != -1) {
+      throw new Error("Already registered this callback!");
+    }
+
+    callbacks.push(callback);
+    if (DEBUG) debug("Registered " + callbackType + " callback: " + callback);
   },
 
-  unregisterTelephonyCallback: function unregisterTelephonyCallback(callback) {
-    if (!this._telephonyCallbacks) {
+  unregisterCallback: function unregisterCallback(callbackType, callback) {
+    let callbacks = this[callbackType];
+    if (!callbacks) {
       return;
     }
-    let index = this._telephonyCallbacks.indexOf(callback);
+
+    let index = callbacks.indexOf(callback);
     if (index != -1) {
-      this._telephonyCallbacks.splice(index, 1);
-      debug("Unregistered telephony callback: " + callback);
+      callbacks.splice(index, 1);
+      if (DEBUG) debug("Unregistered telephony callback: " + callback);
     }
   },
 
+  registerTelephonyCallback: function registerTelephonyCallback(callback) {
+    this.registerCallback("_telephonyCallbacks", callback);
+  },
+
+  unregisterTelephonyCallback: function unregisteTelephonyCallback(callback) {
+    this.unregisterCallback("_telephonyCallbacks", callback);
+  },
+
+  registerVoicemailCallback: function registerVoicemailCallback(callback) {
+    this.registerCallback("_voicemailCallbacks", callback);
+  },
+
+  unregisterVoicemailCallback: function unregisteVoicemailCallback(callback) {
+    this.unregisterCallback("_voicemailCallbacks", callback);
+  },
+
   enumerateCalls: function enumerateCalls(callback) {
     debug("Requesting enumeration of calls for callback: " + callback);
     cpmm.sendAsyncMessage("RIL:EnumerateCalls");
@@ -487,14 +532,19 @@ RILContentHelper.prototype = {
                                  RIL.GECKO_NETWORK_SELECTION_AUTOMATIC);
         break;
       case "RIL:CallStateChanged":
-        this._deliverTelephonyCallback("callStateChanged",
-                                       [msg.json.callIndex, msg.json.state,
-                                        msg.json.number, msg.json.isActive]);
+        this._deliverCallback("_telephonyCallbacks",
+                              "callStateChanged",
+                              [msg.json.callIndex, msg.json.state,
+                               msg.json.number, msg.json.isActive]);
         break;
       case "RIL:CallError":
-        this._deliverTelephonyCallback("notifyError",
-                                        [msg.json.callIndex,
-                                         msg.json.error]);
+        this._deliverCallback("_telephonyCallbacks",
+                              "notifyError",
+                              [msg.json.callIndex,
+                               msg.json.error]);
+        break;
+      case "RIL:VoicemailNotification":
+        this.handleVoicemailNotification(msg.json);
         break;
       case "RIL:GetCardLock:Return:OK":
       case "RIL:SetCardLock:Return:OK":
@@ -590,14 +640,48 @@ RILContentHelper.prototype = {
     }
   },
 
-  _deliverTelephonyCallback: function _deliverTelephonyCallback(name, args) {
-    if (!this._telephonyCallbacks) {
+  handleVoicemailNotification: function handleVoicemailNotification(message) {
+    let changed = false;
+    if (!this.voicemailStatus) {
+      this.voicemailStatus = new VoicemailStatus();
+    }
+
+    if (this.voicemailStatus.hasMessages != message.active) {
+      changed = true;
+      this.voicemailStatus.hasMessages = message.active;
+    }
+
+    if (this.voicemailStatus.messageCount != message.msgCount) {
+      changed = true;
+      this.voicemailStatus.messageCount = message.msgCount;
+    }
+
+    if (this.voicemailStatus.returnNumber != message.returnNumber) {
+      changed = true;
+      this.voicemailStatus.returnNumber = message.returnNumber;
+    }
+
+    if (this.voicemailStatus.returnMessage != message.returnMessage) {
+      changed = true;
+      this.voicemailStatus.returnMessage = message.returnMessage;
+    }
+
+    if (changed) {
+      this._deliverCallback("_voicemailCallbacks",
+                            "voicemailNotification",
+                            [this.voicemailStatus]);
+    }
+  },
+
+  _deliverCallback: function _deliverCallback(callbackType, name, args) {
+    let thisCallbacks = this[callbackType];
+    if (!thisCallbacks) {
       return;
     }
 
-    let callbacks = this._telephonyCallbacks.slice();
+    let callbacks = thisCallbacks.slice();
     for each (let callback in callbacks) {
-      if (this._telephonyCallbacks.indexOf(callback) == -1) {
+      if (thisCallbacks.indexOf(callback) == -1) {
         continue;
       }
       let handler = callback[name];
@@ -610,7 +694,7 @@ RILContentHelper.prototype = {
         debug("callback handler for " + name + " threw an exception: " + e);
       }
     }
-  },
+  }
 };
 
 const NSGetFactory = XPCOMUtils.generateNSGetFactory([RILContentHelper]);
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index b38f36bbd9b..72dd576108b 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -780,6 +780,19 @@ RadioInterfaceLayer.prototype = {
       return;
     }
 
+    // TODO: Bug #768441
+    // For now we don't store indicators persistently. When the mwi.discard
+    // flag is false, we'll need to persist the indicator to EFmwis.
+    // See TS 23.040 9.2.3.24.2
+
+    let mwi = message.mwi;
+    if (mwi) {
+      mwi.returnNumber = message.sender || null;
+      mwi.returnMessage = message.fullBody || null;
+      ppmm.sendAsyncMessage("RIL:VoicemailNotification", mwi);
+      return;
+    }
+
     let id = gSmsDatabaseService.saveReceivedMessage(message.sender || null,
                                                      message.fullBody || null,
                                                      message.timestamp);
@@ -790,6 +803,7 @@ RadioInterfaceLayer.prototype = {
                                            message.fullBody || null,
                                            message.timestamp,
                                            false);
+
     Services.obs.notifyObservers(sms, kSmsReceivedObserverTopic, null);
   },
 
diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js
index 9c4d3b32e87..5815d4f5bde 100644
--- a/dom/system/gonk/ril_consts.js
+++ b/dom/system/gonk/ril_consts.js
@@ -515,7 +515,7 @@ const PDU_TOA_NATIONAL      = 0xA0; // National number. Prefix or escape digits
 const PDU_TOA_NETWORK_SPEC  = 0xB0; // Network specific number This is used to
                                     // indicate administration/service number
                                     // specific to the serving network
-const PDU_TOA_SUSCRIBER     = 0xC0; // Suscriber number. This is used when a
+const PDU_TOA_SUBSCRIBER    = 0xC0; // Subscriber number. This is used when a
                                     // specific short number representation is
                                     // stored in one or more SCs as part of a
                                     // higher layer application
@@ -657,12 +657,23 @@ const PDU_PID_ME_DEPERSONALIZATION         = 0x7E;
 const PDU_PID_USIM_DATA_DOWNLOAD           = 0x7F;
 
 // DCS - Data Coding Scheme
-const PDU_DCS_MSG_CODING_7BITS_ALPHABET = 0x00;
-const PDU_DCS_MSG_CODING_8BITS_ALPHABET = 0x04;
-const PDU_DCS_MSG_CODING_16BITS_ALPHABET= 0x08;
-const PDU_DCS_MSG_CLASS_ME_SPECIFIC     = 0xF1;
-const PDU_DCS_MSG_CLASS_SIM_SPECIFIC    = 0xF2;
-const PDU_DCS_MSG_CLASS_TE_SPECIFIC     = 0xF3;
+const PDU_DCS_MSG_CODING_7BITS_ALPHABET  = 0x00;
+const PDU_DCS_MSG_CODING_8BITS_ALPHABET  = 0x04;
+const PDU_DCS_MSG_CODING_16BITS_ALPHABET = 0x08;
+const PDU_DCS_MSG_CLASS_ME_SPECIFIC      = 0xF1;
+const PDU_DCS_MSG_CLASS_SIM_SPECIFIC     = 0xF2;
+const PDU_DCS_MSG_CLASS_TE_SPECIFIC      = 0xF3;
+const PDU_DCS_CODING_GROUP_BITS          = 0xF0;
+const PDU_DCS_CODING_GROUP_7BITS_DISCARD = 0xC0;
+const PDU_DCS_CODING_GROUP_7BITS_STORE   = 0xD0;
+const PDU_DCS_CODING_GROUP_16BITS_STORE  = 0xE0;
+const PDU_DCS_MWI_ACTIVE_BITS            = 0x08;
+const PDU_DCS_MWI_ACTIVE_VALUE           = 0x08;
+const PDU_DCS_MWI_TYPE_BITS              = 0x03;
+const PDU_DCS_MWI_TYPE_VOICEMAIL         = 0x00;
+const PDU_DCS_MWI_TYPE_FAX               = 0x01;
+const PDU_DCS_MWI_TYPE_EMAIL             = 0x02;
+const PDU_DCS_MWI_TYPE_OTHER             = 0x03;
 
 // Because service center timestamp omit the century. Yay.
 const PDU_TIMESTAMP_YEAR_OFFSET = 2000;
@@ -670,8 +681,8 @@ const PDU_TIMESTAMP_YEAR_OFFSET = 2000;
 // See 9.2.3.24 TP‑User Data (TP‑UD)
 const PDU_IEI_CONCATENATED_SHORT_MESSAGES_8BIT         = 0x00;
 const PDU_IEI_SPECIAL_SMS_MESSAGE_INDICATION           = 0x01;
-const PDU_IEI_APPLICATION_PORT_ADDREESING_SCHEME_8BIT  = 0x04;
-const PDU_IEI_APPLICATION_PORT_ADDREESING_SCHEME_16BIT = 0x05;
+const PDU_IEI_APPLICATION_PORT_ADDRESSING_SCHEME_8BIT  = 0x04;
+const PDU_IEI_APPLICATION_PORT_ADDRESSING_SCHEME_16BIT = 0x05;
 const PDU_IEI_SMSC_CONTROL_PARAMS                      = 0x06;
 const PDU_IEI_UDH_SOURCE_INDICATOR                     = 0x07;
 const PDU_IEI_CONCATENATED_SHORT_MESSAGES_16BIT        = 0x08;
@@ -1334,6 +1345,11 @@ const PDU_NL_SINGLE_SHIFT_TABLES = [
   + "                "
 ];
 
+// Special SMS Message Indication constants
+const PDU_MWI_STORE_TYPE_BIT     = 0x80;
+const PDU_MWI_STORE_TYPE_DISCARD = 0x00;
+const PDU_MWI_STORE_TYPE_STORE   = 0x80;
+
 const RADIOTECH_FAMILY_3GPP = 1;  // GSM, WCDMA, LTE
 const RADIOTECH_FAMILY_3GPP2 = 2; // CDMA, EVDO
 
@@ -1462,5 +1478,7 @@ const GECKO_RADIO_TECH = [
   "hspa+",
 ];
 
+const GECKO_VOICEMAIL_MESSAGE_COUNT_UNKNOWN = -1;
+
 // Allow this file to be imported via Components.utils.import().
 const EXPORTED_SYMBOLS = Object.keys(this);
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 95d4f432f49..dc96e22480c 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -3962,19 +3962,25 @@ let GsmPDUHelper = {
   },
 
   /**
-   * Read 1 + UDHL octets and construct user data header at return.
+   * Read 1 + UDHL octets and construct user data header.
    *
-   * @return A header object with properties contained in received message.
-   * The properties set include:
-   * <ul>
-   * <li>length: totoal length of the header, default 0.
-   * <li>langIndex: used locking shift table index, default
-   *     PDU_NL_IDENTIFIER_DEFAULT.
-   * <li>langShiftIndex: used locking shift table index, default
-   *     PDU_NL_IDENTIFIER_DEFAULT.
-   * </ul>
+   * @param msg
+   *        message object for output.
+   *
+   * @see 3GPP TS 23.040 9.2.3.24
    */
-  readUserDataHeader: function readUserDataHeader() {
+  readUserDataHeader: function readUserDataHeader(msg) {
+    /**
+     * A header object with properties contained in received message.
+     * The properties set include:
+     *
+     * length: totoal length of the header, default 0.
+     * langIndex: used locking shift table index, default
+     * PDU_NL_IDENTIFIER_DEFAULT.
+     * langShiftIndex: used locking shift table index, default
+     * PDU_NL_IDENTIFIER_DEFAULT.
+     *
+     */
     let header = {
       length: 0,
       langIndex: PDU_NL_IDENTIFIER_DEFAULT,
@@ -3982,10 +3988,14 @@ let GsmPDUHelper = {
     };
 
     header.length = this.readHexOctet();
+    if (DEBUG) debug("Read UDH length: " + header.length);
+
     let dataAvailable = header.length;
     while (dataAvailable >= 2) {
       let id = this.readHexOctet();
       let length = this.readHexOctet();
+      if (DEBUG) debug("Read UDH id: " + id + ", length: " + length);
+
       dataAvailable -= 2;
 
       switch (id) {
@@ -4001,7 +4011,7 @@ let GsmPDUHelper = {
           }
           break;
         }
-        case PDU_IEI_APPLICATION_PORT_ADDREESING_SCHEME_8BIT: {
+        case PDU_IEI_APPLICATION_PORT_ADDRESSING_SCHEME_8BIT: {
           let dstp = this.readHexOctet();
           let orip = this.readHexOctet();
           dataAvailable -= 2;
@@ -4016,7 +4026,7 @@ let GsmPDUHelper = {
           header.originatorPort = orip;
           break;
         }
-        case PDU_IEI_APPLICATION_PORT_ADDREESING_SCHEME_16BIT: {
+        case PDU_IEI_APPLICATION_PORT_ADDRESSING_SCHEME_16BIT: {
           let dstp = (this.readHexOctet() << 8) | this.readHexOctet();
           let orip = (this.readHexOctet() << 8) | this.readHexOctet();
           dataAvailable -= 4;
@@ -4055,6 +4065,41 @@ let GsmPDUHelper = {
           if (langIndex < PDU_NL_LOCKING_SHIFT_TABLES.length) {
             header.langIndex = langIndex;
           }
+          break;
+        case PDU_IEI_SPECIAL_SMS_MESSAGE_INDICATION:
+          let msgInd = this.readHexOctet() & 0xFF;
+          let msgCount = this.readHexOctet();
+          dataAvailable -= 2;
+
+
+          /*
+           * TS 23.040 V6.8.1 Sec 9.2.3.24.2
+           * bits 1 0   : basic message indication type
+           * bits 4 3 2 : extended message indication type
+           * bits 6 5   : Profile id
+           * bit  7     : storage type
+           */
+          let storeType = msgInd & PDU_MWI_STORE_TYPE_BIT;
+          let mwi = msg.mwi;
+          if (!mwi) {
+            mwi = msg.mwi = {};
+          }
+
+          if (storeType == PDU_MWI_STORE_TYPE_STORE) {
+            // Store message because TP_UDH indicates so, note this may override
+            // the setting in DCS, but that is expected
+            mwi.discard = false;
+          } else if (mwi.discard === undefined) {
+            // storeType == PDU_MWI_STORE_TYPE_DISCARD
+            // only override mwi.discard here if it hasn't already been set
+            mwi.discard = true;
+          }
+
+          mwi.msgCount = msgCount & 0xFF;
+          mwi.active = mwi.msgCount > 0;
+
+          if (DEBUG) debug("MWI in TP_UDH received: " + JSON.stringify(mwi));
+
           break;
         default:
           if (DEBUG) {
@@ -4083,7 +4128,7 @@ let GsmPDUHelper = {
       throw new Error("Illegal user data header found!");
     }
 
-    return header;
+    msg.header = header;
   },
 
   /**
@@ -4258,9 +4303,21 @@ let GsmPDUHelper = {
         switch (msg.epid) {
           case PDU_PID_SHORT_MESSAGE_TYPE_0:
             return;
+          case PDU_PID_RETURN_CALL_MESSAGE:
+            // Level 1 of message waiting indication:
+            // Only a return call message is provided
+            let mwi = msg.mwi = {};
+
+            // TODO: When should we de-activate the level 1 indicator?
+            mwi.active = true;
+            mwi.discard = false;
+            mwi.msgCount = GECKO_VOICEMAIL_MESSAGE_COUNT_UNKNOWN;
+            if (DEBUG) debug("TP-PID got return call message: " + msg.sender);
+            return;
         }
         break;
     }
+
     msg.epid = PDU_PID_DEFAULT;
   },
 
@@ -4274,6 +4331,10 @@ let GsmPDUHelper = {
    */
   readDataCodingScheme: function readDataCodingScheme(msg) {
     let dcs = this.readHexOctet();
+    if (DEBUG) debug("PDU: read dcs: " + dcs);
+
+    // Level 2 of message waiting indication
+    this.readMessageWaitingFromDCS(msg, dcs);
 
     // 7 bit is the default fallback encoding.
     let encoding = PDU_DCS_MSG_CODING_7BITS_ALPHABET;
@@ -4313,6 +4374,48 @@ let GsmPDUHelper = {
     if (DEBUG) debug("PDU: message encoding is " + encoding + " bit.");
   },
 
+  readMessageWaitingFromDCS: function readMessageWaitingFromDCS(msg, dcs) {
+    // 0xC0 == 7 bit, don't store
+    // 0xD0 == 7 bit, store
+    // 0xE0 == UCS-2, store
+    let codingGroup = dcs & PDU_DCS_CODING_GROUP_BITS;
+
+    if (codingGroup == PDU_DCS_CODING_GROUP_7BITS_DISCARD ||
+        codingGroup == PDU_DCS_CODING_GROUP_7BITS_STORE ||
+        codingGroup == PDU_DCS_CODING_GROUP_16BITS_STORE) {
+
+      // Indiciates voicemail indicator set or clear
+      let active = (dcs & PDU_DCS_MWI_ACTIVE_BITS) == PDU_DCS_MWI_ACTIVE_VALUE;
+
+      // If TP-UDH is present, these values will be overwritten
+      switch (dcs & PDU_DCS_MWI_TYPE_BITS) {
+        case PDU_DCS_MWI_TYPE_VOICEMAIL:
+          let mwi = msg.mwi;
+          if (!mwi) {
+            mwi = msg.mwi = {};
+          }
+
+          mwi.active = active;
+          mwi.discard = codingGroup == PDU_DCS_CODING_GROUP_7BITS_DISCARD;
+          mwi.msgCount = active ? GECKO_VOICEMAIL_MESSAGE_COUNT_UNKNOWN : 0;
+
+          if (DEBUG) {
+            debug("MWI in DCS received for voicemail: " + JSON.stringify(mwi));
+          }
+          break;
+        case PDU_DCS_MWI_TYPE_FAX:
+          if (DEBUG) debug("MWI in DCS received for fax");
+          break;
+        case PDU_DCS_MWI_TYPE_EMAIL:
+          if (DEBUG) debug("MWI in DCS received for email");
+          break;
+        default:
+          if (DEBUG) debug("MWI in DCS received for \"other\"");
+          break;
+      }
+    }
+  },
+
   /**
    * Read GSM TP-Service-Centre-Time-Stamp(TP-SCTS).
    *
@@ -4356,7 +4459,7 @@ let GsmPDUHelper = {
 
     let paddingBits = 0;
     if (msg.udhi) {
-      msg.header = this.readUserDataHeader();
+      this.readUserDataHeader(msg);
 
       if (msg.encoding == PDU_DCS_MSG_CODING_7BITS_ALPHABET) {
         let headerBits = (msg.header.length + 1) * 8;
@@ -4369,6 +4472,8 @@ let GsmPDUHelper = {
       }
     }
 
+    if (DEBUG) debug("After header, " + length + " septets left of user data");
+
     msg.body = null;
     msg.data = null;
     switch (msg.encoding) {
@@ -4454,13 +4559,15 @@ let GsmPDUHelper = {
       //                  D  DR S  SR ST C
       SMSC:      null, // M  M  M  M  M  M
       mti:       null, // M  M  M  M  M  M
-      udhi:      null, // M  M  X  M  M  M
+      udhi:      null, // M  M  O  M  M  M
       sender:    null, // M  X  X  X  X  X
       recipient: null, // X  X  M  X  M  M
       pid:       null, // M  O  M  O  O  M
       epid:      null, // M  O  M  O  O  M
       dcs:       null, // M  O  M  O  O  X
-      encoding:  null, // M  O  M  O  O  X
+      mwi:       null, // O  O  O  O  O  O
+      replace:  false, // O  O  O  O  O  O
+      header:    null, // M  M  O  M  M  M
       body:      null, // M  O  M  O  O  O
       data:      null, // M  O  M  O  O  O
       timestamp: null, // M  X  X  X  X  X

From de4aa63592ce22b36aa611d7a118ef1c27fb7e6c Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall@mozilla.com>
Date: Thu, 19 Jul 2012 11:27:19 +0800
Subject: [PATCH 105/118] Bug 736710 - Part 3: Voicemail DOM implementation
 classes. r=smaug

---
 dom/base/Navigator.cpp           |  35 ++++++++++
 dom/base/Navigator.h             |   2 +
 dom/base/nsDOMClassInfo.cpp      |  16 +++++
 dom/base/nsDOMClassInfoClasses.h |   2 +
 dom/telephony/Makefile.in        |   5 ++
 dom/telephony/TelephonyFactory.h |   6 +-
 dom/telephony/Voicemail.cpp      | 111 +++++++++++++++++++++++++++++++
 dom/telephony/Voicemail.h        |  61 +++++++++++++++++
 dom/telephony/VoicemailEvent.cpp |  64 ++++++++++++++++++
 dom/telephony/VoicemailEvent.h   |  42 ++++++++++++
 10 files changed, 343 insertions(+), 1 deletion(-)
 create mode 100644 dom/telephony/Voicemail.cpp
 create mode 100644 dom/telephony/Voicemail.h
 create mode 100644 dom/telephony/VoicemailEvent.cpp
 create mode 100644 dom/telephony/VoicemailEvent.h

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index b05b4ab48ce..19bc38d341b 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -158,6 +158,10 @@ Navigator::Invalidate()
   if (mTelephony) {
     mTelephony = nsnull;
   }
+
+  if (mVoicemail) {
+    mVoicemail = nsnull;
+  }
 #endif
 
   if (mConnection) {
@@ -1180,6 +1184,37 @@ Navigator::GetMozTelephony(nsIDOMTelephony** aTelephony)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+Navigator::GetMozVoicemail(nsIDOMMozVoicemail** aVoicemail)
+{
+  *aVoicemail = nsnull;
+
+  if (!mVoicemail) {
+    nsCOMPtr<nsPIDOMWindow> window = do_QueryReferent(mWindow);
+    NS_ENSURE_TRUE(window && window->GetDocShell(), NS_OK);
+
+    // Chrome is always allowed access, so do the permission check only
+    // for non-chrome pages.
+    if (!nsContentUtils::IsCallerChrome()) {
+      nsCOMPtr<nsIDocument> doc = do_QueryInterface(window->GetExtantDocument());
+      NS_ENSURE_TRUE(doc, NS_OK);
+
+      nsCOMPtr<nsIURI> uri;
+      doc->NodePrincipal()->GetURI(getter_AddRefs(uri));
+
+      if (!nsContentUtils::URIIsChromeOrInPref(uri, "dom.voicemail.whitelist")) {
+        return NS_OK;
+      }
+    }
+
+    nsresult rv = NS_NewVoicemail(window, getter_AddRefs(mVoicemail));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  NS_ADDREF(*aVoicemail = mVoicemail);
+  return NS_OK;
+}
+
 #endif // MOZ_B2G_RIL
 
 //*****************************************************************************
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
index 0cef567dfa7..cc810bfb891 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -32,6 +32,7 @@ class nsIDOMMozConnection;
 #ifdef MOZ_B2G_RIL
 #include "nsIDOMNavigatorTelephony.h"
 class nsIDOMTelephony;
+class nsIDOMMozVoicemail;
 #endif
 
 #ifdef MOZ_B2G_BT
@@ -147,6 +148,7 @@ private:
   nsRefPtr<sms::SmsManager> mSmsManager;
 #ifdef MOZ_B2G_RIL
   nsCOMPtr<nsIDOMTelephony> mTelephony;
+  nsCOMPtr<nsIDOMMozVoicemail> mVoicemail;
 #endif
   nsRefPtr<network::Connection> mConnection;
   nsRefPtr<network::MobileConnection> mMobileConnection;
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index a62055b4dbc..1bbb5c21284 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -512,6 +512,8 @@ using mozilla::dom::indexedDB::IDBWrapperCache;
 #include "Telephony.h"
 #include "TelephonyCall.h"
 #include "CallEvent.h"
+#include "nsIDOMVoicemail.h"
+#include "nsIDOMVoicemailEvent.h"
 #endif
 
 #ifdef MOZ_B2G_BT
@@ -1667,6 +1669,10 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            EVENTTARGET_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(CallEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(MozVoicemail, nsEventTargetSH,
+                           EVENTTARGET_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(MozVoicemailEvent, nsDOMGenericSH,
+                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 #endif
 
 #ifdef MOZ_B2G_BT
@@ -4480,6 +4486,16 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMCallEvent)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEvent)
   DOM_CLASSINFO_MAP_END
+
+  DOM_CLASSINFO_MAP_BEGIN(MozVoicemail, nsIDOMMozVoicemail)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozVoicemail)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
+  DOM_CLASSINFO_MAP_END
+
+  DOM_CLASSINFO_MAP_BEGIN(MozVoicemailEvent, nsIDOMMozVoicemailEvent)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozVoicemailEvent)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMEvent)
+  DOM_CLASSINFO_MAP_END
 #endif
 
 #ifdef MOZ_B2G_BT
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 5666d0309d7..1f5f983581d 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -523,6 +523,8 @@ DOMCI_CLASS(MozWifiConnectionInfoEvent)
 DOMCI_CLASS(Telephony)
 DOMCI_CLASS(TelephonyCall)
 DOMCI_CLASS(CallEvent)
+DOMCI_CLASS(MozVoicemail)
+DOMCI_CLASS(MozVoicemailEvent)
 #endif
 
 #ifdef MOZ_B2G_BT
diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in
index 345cf6a5aef..f9ddd721eb3 100644
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -21,6 +21,8 @@ CPPSRCS = \
   Telephony.cpp \
   TelephonyCall.cpp \
   CallEvent.cpp \
+  Voicemail.cpp \
+  VoicemailEvent.cpp \
   $(NULL)
 
 XPIDLSRCS = \
@@ -28,6 +30,9 @@ XPIDLSRCS = \
   nsIDOMTelephony.idl \
   nsIDOMTelephonyCall.idl \
   nsIDOMCallEvent.idl \
+  nsIDOMVoicemail.idl \
+  nsIDOMVoicemailEvent.idl \
+  nsIDOMVoicemailStatus.idl \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/telephony/TelephonyFactory.h b/dom/telephony/TelephonyFactory.h
index 1295e78bc74..93ae9fde70d 100644
--- a/dom/telephony/TelephonyFactory.h
+++ b/dom/telephony/TelephonyFactory.h
@@ -8,11 +8,15 @@
 #define mozilla_dom_telephony_telephonyfactory_h__
 
 #include "nsIDOMTelephony.h"
+#include "nsIDOMVoicemail.h"
 #include "nsPIDOMWindow.h"
 
-// Implemented in Telephony.cpp.
+// Implemented in Telephony.cpp / Voicemail.cpp.
 
 nsresult
 NS_NewTelephony(nsPIDOMWindow* aWindow, nsIDOMTelephony** aTelephony);
 
+nsresult
+NS_NewVoicemail(nsPIDOMWindow* aWindow, nsIDOMMozVoicemail** aVoicemail);
+
 #endif // mozilla_dom_telephony_telephonyfactory_h__
diff --git a/dom/telephony/Voicemail.cpp b/dom/telephony/Voicemail.cpp
new file mode 100644
index 00000000000..0a982cfaa48
--- /dev/null
+++ b/dom/telephony/Voicemail.cpp
@@ -0,0 +1,111 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=40: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Voicemail.h"
+#include "nsIDOMVoicemailStatus.h"
+
+#include "mozilla/Services.h"
+#include "nsContentUtils.h"
+#include "nsDOMClassInfo.h"
+#include "nsRadioInterfaceLayer.h"
+#include "nsServiceManagerUtils.h"
+
+#include "VoicemailEvent.h"
+
+DOMCI_DATA(MozVoicemail, mozilla::dom::telephony::Voicemail)
+
+USING_TELEPHONY_NAMESPACE
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(Voicemail)
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(Voicemail,
+                                                  nsDOMEventTargetHelper)
+  NS_CYCLE_COLLECTION_TRAVERSE_EVENT_HANDLER(statuschanged)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(Voicemail,
+                                                nsDOMEventTargetHelper)
+  NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(statuschanged)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(Voicemail)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMMozVoicemail)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozVoicemail)
+NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
+
+NS_IMPL_ADDREF_INHERITED(Voicemail, nsDOMEventTargetHelper)
+NS_IMPL_RELEASE_INHERITED(Voicemail, nsDOMEventTargetHelper)
+
+NS_IMPL_ISUPPORTS1(Voicemail::RILVoicemailCallback, nsIRILVoicemailCallback)
+
+Voicemail::Voicemail(nsPIDOMWindow* aWindow, nsIRILContentHelper* aRIL)
+  : mRIL(aRIL)
+{
+  BindToOwner(aWindow);
+
+  mRILVoicemailCallback = new RILVoicemailCallback(this);
+
+  nsresult rv = aRIL->RegisterVoicemailCallback(mRILVoicemailCallback);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed registering voicemail callback with RIL");
+  }
+}
+
+Voicemail::~Voicemail()
+{
+  if (mRIL && mRILVoicemailCallback) {
+    mRIL->UnregisterVoicemailCallback(mRILVoicemailCallback);
+  }
+}
+
+// nsIDOMMozVoicemail
+
+NS_IMETHODIMP
+Voicemail::GetStatus(nsIDOMMozVoicemailStatus** aStatus)
+{
+  *aStatus = nsnull;
+
+  NS_ENSURE_STATE(mRIL);
+  return mRIL->GetVoicemailStatus(aStatus);
+}
+
+NS_IMPL_EVENT_HANDLER(Voicemail, statuschanged)
+
+// nsIRILVoicemailCallback
+
+NS_IMETHODIMP
+Voicemail::VoicemailNotification(nsIDOMMozVoicemailStatus* aStatus)
+{
+  nsRefPtr<VoicemailEvent> event = new VoicemailEvent(nsnull, nsnull);
+  nsresult rv = event->InitVoicemailEvent(NS_LITERAL_STRING("statuschanged"),
+                                          false, false, aStatus);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = event->SetTrusted(true);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  bool dummy;
+  rv = DispatchEvent(static_cast<nsIDOMMozVoicemailEvent*>(event), &dummy);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
+NS_NewVoicemail(nsPIDOMWindow* aWindow, nsIDOMMozVoicemail** aVoicemail)
+{
+  nsPIDOMWindow* innerWindow = aWindow->IsInnerWindow() ?
+    aWindow :
+    aWindow->GetCurrentInnerWindow();
+
+  nsCOMPtr<nsIRILContentHelper> ril =
+    do_GetService(NS_RILCONTENTHELPER_CONTRACTID);
+  NS_ENSURE_STATE(ril);
+
+  nsRefPtr<Voicemail> voicemail = new Voicemail(innerWindow, ril);
+  voicemail.forget(aVoicemail);
+  return NS_OK;
+}
diff --git a/dom/telephony/Voicemail.h b/dom/telephony/Voicemail.h
new file mode 100644
index 00000000000..fc02e751911
--- /dev/null
+++ b/dom/telephony/Voicemail.h
@@ -0,0 +1,61 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=40: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_telephony_voicemail_h__
+#define mozilla_dom_telephony_voicemail_h__
+
+#include "TelephonyCommon.h"
+
+#include "nsDOMEvent.h"
+#include "nsDOMEventTargetHelper.h"
+#include "nsIDOMVoicemail.h"
+#include "nsIRadioInterfaceLayer.h"
+
+class nsIRILContentHelper;
+class nsIDOMMozVoicemailStatus;
+
+BEGIN_TELEPHONY_NAMESPACE
+
+class Voicemail : public nsDOMEventTargetHelper,
+                  public nsIDOMMozVoicemail
+{
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIDOMMOZVOICEMAIL
+  NS_DECL_NSIRILVOICEMAILCALLBACK
+
+  NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper::)
+
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(Voicemail, nsDOMEventTargetHelper)
+
+  Voicemail(nsPIDOMWindow* aWindow, nsIRILContentHelper* aRIL);
+  virtual ~Voicemail();
+
+private:
+  nsCOMPtr<nsIRILContentHelper> mRIL;
+  nsCOMPtr<nsIRILVoicemailCallback> mRILVoicemailCallback;
+
+  NS_DECL_EVENT_HANDLER(statuschanged)
+
+  class RILVoicemailCallback : public nsIRILVoicemailCallback
+  {
+    Voicemail* mVoicemail;
+
+  public:
+    NS_DECL_ISUPPORTS
+    NS_FORWARD_NSIRILVOICEMAILCALLBACK(mVoicemail->)
+
+    RILVoicemailCallback(Voicemail* aVoicemail)
+    : mVoicemail(aVoicemail)
+    {
+      NS_ASSERTION(mVoicemail, "Null pointer!");
+    }
+  };
+};
+
+END_TELEPHONY_NAMESPACE
+
+#endif // mozilla_dom_telephony_voicemail_h__
diff --git a/dom/telephony/VoicemailEvent.cpp b/dom/telephony/VoicemailEvent.cpp
new file mode 100644
index 00000000000..3a873146da7
--- /dev/null
+++ b/dom/telephony/VoicemailEvent.cpp
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "VoicemailEvent.h"
+#include "nsDOMClassInfo.h"
+#include "nsIDOMVoicemailStatus.h"
+
+DOMCI_DATA(MozVoicemailEvent, mozilla::dom::telephony::VoicemailEvent)
+
+USING_TELEPHONY_NAMESPACE
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(VoicemailEvent)
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(VoicemailEvent, nsDOMEvent)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mStatus)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(VoicemailEvent, nsDOMEvent)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mStatus)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(VoicemailEvent)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMMozVoicemailEvent)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozVoicemailEvent)
+NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
+
+NS_IMPL_ADDREF_INHERITED(VoicemailEvent, nsDOMEvent)
+NS_IMPL_RELEASE_INHERITED(VoicemailEvent, nsDOMEvent)
+
+nsresult
+VoicemailEvent::InitVoicemailEvent(const nsAString& aEventTypeArg,
+                                   bool aCanBubbleArg, bool aCancelableArg,
+                                   nsIDOMMozVoicemailStatus* aStatus)
+{
+  nsresult rv = nsDOMEvent::InitEvent(aEventTypeArg, aCanBubbleArg,
+                                      aCancelableArg);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mStatus = aStatus;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+VoicemailEvent::GetStatus(nsIDOMMozVoicemailStatus** aStatus)
+{
+  NS_IF_ADDREF(*aStatus = mStatus);
+  return NS_OK;
+}
+
+namespace {
+
+nsresult
+NS_NewDOMVoicemailEvent(nsIDOMEvent** aInstancePtrResult,
+                  nsPresContext* aPresContext,
+                  nsEvent* aEvent)
+{
+  return CallQueryInterface(
+    new mozilla::dom::telephony::VoicemailEvent(aPresContext, aEvent),
+    aInstancePtrResult);
+}
+
+}
diff --git a/dom/telephony/VoicemailEvent.h b/dom/telephony/VoicemailEvent.h
new file mode 100644
index 00000000000..1a8aefe4bd7
--- /dev/null
+++ b/dom/telephony/VoicemailEvent.h
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_telephony_VoicemailEvent_h__
+#define mozilla_dom_telephony_VoicemailEvent_h__
+
+#include "TelephonyCommon.h"
+
+#include "nsIDOMVoicemailEvent.h"
+#include "nsDOMEvent.h"
+
+class nsIDOMMozVoicemailStatus;
+
+BEGIN_TELEPHONY_NAMESPACE
+
+class VoicemailEvent : public nsIDOMMozVoicemailEvent,
+                       public nsDOMEvent
+{
+public:
+  VoicemailEvent(nsPresContext* aPresContext, nsEvent* aEvent)
+    : nsDOMEvent(aPresContext, aEvent) { }
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIDOMMOZVOICEMAILEVENT
+
+  NS_FORWARD_TO_NSDOMEVENT
+
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(VoicemailEvent, nsDOMEvent)
+
+  nsresult InitVoicemailEvent(const nsAString& aEventTypeArg,
+                              bool aCanBubbleArg, bool aCancelableArg,
+                              nsIDOMMozVoicemailStatus* aStatus);
+
+private:
+  nsCOMPtr<nsIDOMMozVoicemailStatus> mStatus;
+};
+
+END_TELEPHONY_NAMESPACE
+
+#endif // mozilla_dom_telephony_VoicemailEvent_h__

From 4bdd46e24ad08eaece0ab59fcf2013fd95c5bf83 Mon Sep 17 00:00:00 2001
From: Marshall Culpepper <marshall@mozilla.com>
Date: Thu, 19 Jul 2012 11:27:35 +0800
Subject: [PATCH 106/118] Bug 736710 - Part 4: Marionette unit tests for
 Voicemail API. r=vicamo

---
 dom/telephony/test/marionette/manifest.ini    |   1 +
 dom/telephony/test/marionette/pdu_builder.js  | 149 ++++++++++++
 .../test_voicemail_statuschanged.js           | 229 ++++++++++++++++++
 .../test_voicemail_statuschanged.py           |  20 ++
 4 files changed, 399 insertions(+)
 create mode 100644 dom/telephony/test/marionette/pdu_builder.js
 create mode 100644 dom/telephony/test/marionette/test_voicemail_statuschanged.js
 create mode 100644 dom/telephony/test/marionette/test_voicemail_statuschanged.py

diff --git a/dom/telephony/test/marionette/manifest.ini b/dom/telephony/test/marionette/manifest.ini
index 5ed5c088b3d..58092a80b4f 100644
--- a/dom/telephony/test/marionette/manifest.ini
+++ b/dom/telephony/test/marionette/manifest.ini
@@ -16,3 +16,4 @@ qemu = true
 #[test_outgoing_busy.js]
 #expectedfailure = true
 [test_outgoing_reject.js]
+[test_voicemail_statuschanged.py]
diff --git a/dom/telephony/test/marionette/pdu_builder.js b/dom/telephony/test/marionette/pdu_builder.js
new file mode 100644
index 00000000000..d6086143962
--- /dev/null
+++ b/dom/telephony/test/marionette/pdu_builder.js
@@ -0,0 +1,149 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+// Only bring in what we need from ril_worker/RadioInterfaceLayer here. Reusing
+// that code turns out to be a nightmare, so there is some code duplication.
+let PDUBuilder = {
+  toHexString: function toHexString(n, length) {
+    let str = n.toString(16);
+    if (str.length < length) {
+      for (let i = 0; i < length - str.length; i++) {
+        str = "0" + str;
+      }
+    }
+    return str.toUpperCase();
+  },
+
+  writeUint16: function writeUint16(value) {
+    this.buf += (value & 0xff).toString(16).toUpperCase();
+    this.buf += ((value >> 8) & 0xff).toString(16).toUpperCase();
+  },
+
+  writeHexOctet: function writeHexOctet(octet) {
+    this.buf += this.toHexString(octet, 2);
+  },
+
+  writeSwappedNibbleBCD: function writeSwappedNibbleBCD(data) {
+    data = data.toString();
+    let zeroCharCode = '0'.charCodeAt(0);
+
+    for (let i = 0; i < data.length; i += 2) {
+      let low = data.charCodeAt(i) - zeroCharCode;
+      let high;
+      if (i + 1 < data.length) {
+        high = data.charCodeAt(i + 1) - zeroCharCode;
+      } else {
+        high = 0xF;
+      }
+
+      this.writeHexOctet((high << 4) | low);
+    }
+  },
+
+  writeStringAsSeptets: function writeStringAsSeptets(message,
+                                                      paddingBits,
+                                                      langIndex,
+                                                      langShiftIndex)
+  {
+    const langTable = PDU_NL_LOCKING_SHIFT_TABLES[langIndex];
+    const langShiftTable = PDU_NL_SINGLE_SHIFT_TABLES[langShiftIndex];
+
+    let dataBits = paddingBits;
+    let data = 0;
+    for (let i = 0; i < message.length; i++) {
+      let septet = langTable.indexOf(message[i]);
+      if (septet == PDU_NL_EXTENDED_ESCAPE) {
+        continue;
+      }
+
+      if (septet >= 0) {
+        data |= septet << dataBits;
+        dataBits += 7;
+      } else {
+        septet = langShiftTable.indexOf(message[i]);
+        if (septet == -1) {
+          throw new Error(message[i] + " not in 7 bit alphabet "
+                          + langIndex + ":" + langShiftIndex + "!");
+        }
+
+        if (septet == PDU_NL_RESERVED_CONTROL) {
+          continue;
+        }
+
+        data |= PDU_NL_EXTENDED_ESCAPE << dataBits;
+        dataBits += 7;
+        data |= septet << dataBits;
+        dataBits += 7;
+      }
+
+      for (; dataBits >= 8; dataBits -= 8) {
+        this.writeHexOctet(data & 0xFF);
+        data >>>= 8;
+      }
+    }
+
+    if (dataBits != 0) {
+      this.writeHexOctet(data & 0xFF);
+    }
+  },
+
+  buildAddress: function buildAddress(address) {
+    let addressFormat = PDU_TOA_ISDN; // 81
+    if (address[0] == '+') {
+      addressFormat = PDU_TOA_INTERNATIONAL | PDU_TOA_ISDN; // 91
+      address = address.substring(1);
+    }
+
+    this.buf = "";
+    this.writeHexOctet(address.length);
+    this.writeHexOctet(addressFormat);
+    this.writeSwappedNibbleBCD(address);
+
+    return this.buf;
+  },
+
+  // assumes 7 bit encoding
+  buildUserData: function buildUserData(options) {
+    let headerLength = 0;
+    this.buf = "";
+    if (options.headers) {
+      for each (let header in options.headers) {
+        headerLength += 2; // id + length octets
+        if (header.octets) {
+          headerLength += header.octets.length;
+        }
+      };
+    }
+
+    let encodedBodyLength = options.body.length;
+    let headerOctets = (headerLength ? headerLength + 1 : 0);
+
+    let paddingBits;
+    let userDataLengthInSeptets;
+    let headerSeptets = Math.ceil(headerOctets * 8 / 7);
+    userDataLengthInSeptets = headerSeptets + encodedBodyLength;
+    paddingBits = headerSeptets * 7 - headerOctets * 8;
+
+    this.writeHexOctet(userDataLengthInSeptets);
+    if (options.headers) {
+      this.writeHexOctet(headerLength);
+
+      for each (let header in options.headers) {
+        this.writeHexOctet(header.id);
+        this.writeHexOctet(header.length);
+
+        if (header.octets) {
+          for each (let octet in header.octets) {
+            this.writeHexOctet(octet);
+          }
+        }
+      }
+    }
+
+    this.writeStringAsSeptets(options.body, paddingBits,
+                              PDU_NL_IDENTIFIER_DEFAULT,
+                              PDU_NL_IDENTIFIER_DEFAULT);
+    return this.buf;
+  }
+};
diff --git a/dom/telephony/test/marionette/test_voicemail_statuschanged.js b/dom/telephony/test/marionette/test_voicemail_statuschanged.js
new file mode 100644
index 00000000000..06688faa70b
--- /dev/null
+++ b/dom/telephony/test/marionette/test_voicemail_statuschanged.js
@@ -0,0 +1,229 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const WHITELIST_PREF = "dom.voicemail.whitelist";
+let uriPrePath = window.location.protocol + "//" + window.location.host;
+SpecialPowers.setCharPref(WHITELIST_PREF, uriPrePath);
+
+let voicemail = window.navigator.mozVoicemail;
+ok(voicemail instanceof MozVoicemail);
+is(voicemail.status, null);
+
+function sendIndicatorPDU(pdu, listener, nextTest) {
+  let smsCommand = "sms pdu " + pdu;
+  let commandCompleted = false;
+  let sawEvent = false;
+
+ voicemail.addEventListener("statuschanged", function statusChanged(event) {
+    voicemail.removeEventListener("statuschanged", statusChanged);
+
+    try {
+      listener(event);
+    } catch (e) {
+      ok(false, String(e));
+    }
+
+    sawEvent = true;
+    if (commandCompleted) {
+      nextTest();
+    }
+  });
+
+  log("-> " + smsCommand);
+  runEmulatorCmd(smsCommand, function(result) {
+    log("<- " + result);
+    is(result[0], "OK");
+    commandCompleted = true;
+    if (sawEvent) {
+      nextTest();
+    }
+  });
+}
+
+// TODO: Add tests for store/discard once they are implemented
+// See RadioInterfaceLayer.js / Bug #768441
+
+function isVoicemailStatus(status) {
+  is(voicemail.status.hasMessages, status.hasMessages);
+  is(voicemail.status.messageCount, status.messageCount);
+  is(voicemail.status.returnNumber, status.returnNumber);
+  is(voicemail.status.returnMessage, status.returnMessage);
+}
+
+const MWI_PDU_PREFIX = "0000";
+const MWI_PDU_UDH_PREFIX = "0040";
+const MWI_PID_DEFAULT = "00";
+const MWI_PID_RETURN_CALL_MSG = "5F";
+const MWI_DCS_DATA_MSG = "F0";
+const MWI_DCS_DISCARD_INACTIVE = "C0";
+const MWI_DCS_DISCARD_ACTIVE = "C8";
+const MWI_TIMESTAMP = "00000000000000";
+
+const MWI_LEVEL1_SENDER = "+15125551234";
+const MWI_LEVEL1_PDU_ADDRESS = PDUBuilder.buildAddress(MWI_LEVEL1_SENDER);
+const MWI_DEFAULT_BODY = "1 new voicemail";
+const MWI_UD_DEFAULT = PDUBuilder.buildUserData({
+  body: MWI_DEFAULT_BODY
+});
+
+// Level 1 Message Waiting is just a return call message
+const MWI_LEVEL1_PDU =
+  MWI_PDU_PREFIX +
+  MWI_LEVEL1_PDU_ADDRESS +
+  MWI_PID_RETURN_CALL_MSG +
+  MWI_DCS_DATA_MSG +
+  MWI_TIMESTAMP +
+  MWI_UD_DEFAULT;
+
+function testLevel1Indicator() {
+
+  function onLevel1Indicator(event) {
+    let status = event.status;
+    ok(status instanceof MozVoicemailStatus);
+    is(status.hasMessages, true);
+    is(status.messageCount, status.MESSAGE_COUNT_UNKNOWN);
+    is(status.returnNumber, MWI_LEVEL1_SENDER);
+    is(status.returnMessage, MWI_DEFAULT_BODY);
+    isVoicemailStatus(status);
+  }
+
+  sendIndicatorPDU(MWI_LEVEL1_PDU, onLevel1Indicator, testLevel2DiscardActive);
+}
+
+const MWI_LEVEL2_SENDER = "+15125551235";
+const MWI_LEVEL2_PDU_ADDRESS = PDUBuilder.buildAddress(MWI_LEVEL2_SENDER);
+const MWI_LEVEL2_DISCARD_ACTIVE_PDU =
+  MWI_PDU_PREFIX +
+  MWI_LEVEL2_PDU_ADDRESS +
+  MWI_PID_DEFAULT +
+  MWI_DCS_DISCARD_ACTIVE +
+  MWI_TIMESTAMP +
+  MWI_UD_DEFAULT;
+
+function testLevel2DiscardActive() {
+
+  function onLevel2Active(event) {
+    let status = event.status;
+    ok(status instanceof MozVoicemailStatus);
+    is(status.hasMessages, true);
+    is(status.messageCount, status.MESSAGE_COUNT_UNKNOWN);
+    is(status.returnNumber, MWI_LEVEL2_SENDER);
+    is(status.returnMessage, MWI_DEFAULT_BODY);
+    isVoicemailStatus(status);
+  }
+
+  sendIndicatorPDU(MWI_LEVEL2_DISCARD_ACTIVE_PDU,
+                   onLevel2Active,
+                   testLevel2DiscardInactive);
+
+}
+
+const MWI_LEVEL2_DISCARD_INACTIVE_PDU =
+  MWI_PDU_PREFIX +
+  MWI_LEVEL2_PDU_ADDRESS +
+  MWI_PID_DEFAULT +
+  MWI_DCS_DISCARD_INACTIVE +
+  MWI_TIMESTAMP +
+  MWI_UD_DEFAULT;
+
+function testLevel2DiscardInactive() {
+  function onLevel2Inactive(event) {
+    let status = event.status;
+    ok(status instanceof MozVoicemailStatus);
+    is(status.hasMessages, false);
+    is(status.messageCount, 0);
+    is(status.returnNumber, MWI_LEVEL2_SENDER);
+    is(status.returnMessage, MWI_DEFAULT_BODY);
+    isVoicemailStatus(status);
+  }
+
+  sendIndicatorPDU(MWI_LEVEL2_DISCARD_INACTIVE_PDU,
+                   onLevel2Inactive,
+                   testLevel3DiscardActive);
+}
+
+
+// Tests for Level 3 MWI with a message count in the User Data Header
+const MWI_LEVEL3_SENDER = "+15125551236";
+const MWI_LEVEL3_PDU_ADDRESS = PDUBuilder.buildAddress(MWI_LEVEL3_SENDER);
+
+const MWI_LEVEL3_ACTIVE_UDH_MSG_COUNT = 3;
+const MWI_LEVEL3_ACTIVE_BODY = "3 new voicemails";
+const MWI_LEVEL3_ACTIVE_UD = PDUBuilder.buildUserData({
+  headers: [{
+    id: PDU_IEI_SPECIAL_SMS_MESSAGE_INDICATION,
+    length: 2,
+    octets: [
+      PDU_MWI_STORE_TYPE_DISCARD,
+      MWI_LEVEL3_ACTIVE_UDH_MSG_COUNT
+    ]
+  }],
+  body: MWI_LEVEL3_ACTIVE_BODY
+});
+
+const MWI_LEVEL3_DISCARD_ACTIVE_PDU =
+  MWI_PDU_UDH_PREFIX +
+  MWI_LEVEL3_PDU_ADDRESS +
+  MWI_PID_DEFAULT +
+  MWI_DCS_DISCARD_ACTIVE +
+  MWI_TIMESTAMP +
+  MWI_LEVEL3_ACTIVE_UD;
+
+function testLevel3DiscardActive() {
+
+  function onLevel3Active(event) {
+    let status = event.status;
+    ok(status instanceof MozVoicemailStatus);
+    is(status.hasMessages, true);
+    is(status.messageCount, MWI_LEVEL3_ACTIVE_UDH_MSG_COUNT);
+    is(status.returnNumber, MWI_LEVEL3_SENDER);
+    is(status.returnMessage, MWI_LEVEL3_ACTIVE_BODY);
+    isVoicemailStatus(status);
+  }
+
+  sendIndicatorPDU(MWI_LEVEL3_DISCARD_ACTIVE_PDU,
+                   onLevel3Active,
+                   testLevel3DiscardInactive);
+}
+
+const MWI_LEVEL3_INACTIVE_BODY = "No unread voicemails";
+const MWI_LEVEL3_INACTIVE_UD = PDUBuilder.buildUserData({
+  headers: [{
+    id: PDU_IEI_SPECIAL_SMS_MESSAGE_INDICATION,
+    length: 2,
+    octets: [
+      PDU_MWI_STORE_TYPE_DISCARD,
+      0 // messageCount
+    ]
+  }],
+  body: MWI_LEVEL3_INACTIVE_BODY
+});
+
+const MWI_LEVEL3_DISCARD_INACTIVE_PDU =
+  MWI_PDU_UDH_PREFIX +
+  MWI_LEVEL3_PDU_ADDRESS +
+  MWI_PID_DEFAULT +
+  MWI_DCS_DISCARD_ACTIVE +
+  MWI_TIMESTAMP +
+  MWI_LEVEL3_INACTIVE_UD;
+
+function testLevel3DiscardInactive() {
+  function onLevel3Inactive(event) {
+    let status = event.status;
+    ok(status instanceof MozVoicemailStatus);
+    is(status.hasMessages, false);
+    is(status.messageCount, 0);
+    is(status.returnNumber, MWI_LEVEL3_SENDER);
+    is(status.returnMessage, MWI_LEVEL3_INACTIVE_BODY);
+    isVoicemailStatus(status);
+  }
+
+  sendIndicatorPDU(MWI_LEVEL3_DISCARD_INACTIVE_PDU, onLevel3Inactive, cleanUp);
+}
+
+function cleanUp() {
+  SpecialPowers.clearUserPref(WHITELIST_PREF);
+  finish();
+}
+
+testLevel1Indicator();
diff --git a/dom/telephony/test/marionette/test_voicemail_statuschanged.py b/dom/telephony/test/marionette/test_voicemail_statuschanged.py
new file mode 100644
index 00000000000..53856f30ac8
--- /dev/null
+++ b/dom/telephony/test/marionette/test_voicemail_statuschanged.py
@@ -0,0 +1,20 @@
+from marionette_test import MarionetteTestCase
+import os
+
+class TestVoicemailStatusChanged(MarionetteTestCase):
+
+    def testStatusChanged(self):
+        this_dir = os.path.abspath(os.path.dirname(__file__))
+        system_gonk_dir = os.path.abspath(os.path.join(this_dir,
+            os.path.pardir, os.path.pardir, os.path.pardir, "system", "gonk"))
+
+        ril_consts_path = os.path.join(system_gonk_dir, "ril_consts.js")
+        self.marionette.import_script(ril_consts_path)
+
+        pdu_builder_path = os.path.join(this_dir, "pdu_builder.js")
+        self.marionette.import_script(pdu_builder_path)
+
+        test_path = os.path.join(this_dir, "test_voicemail_statuschanged.js")
+        test = open(test_path, "r").read()
+        self.marionette.set_script_timeout(30000)
+        self.marionette.execute_async_script(test)

From f35f75fd3ca83008fb1a69567e8710d35f465f84 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:37:09 -0400
Subject: [PATCH 107/118] Bug 758992 - Make the classes which use the XPCOM
 nsISupports implementation macros final, to avoid the warning about deleting
 using a pointer to a base class with virtual functions and no virtual dtor
 (security parts); blanket-r=bzbarsky

---
 security/manager/pki/src/nsFormSigningDialog.h     | 3 ++-
 security/manager/ssl/src/NSSErrorsService.h        | 3 ++-
 security/manager/ssl/src/nsCertOverrideService.h   | 9 +++++----
 security/manager/ssl/src/nsCertTree.h              | 3 ++-
 security/manager/ssl/src/nsClientAuthRemember.h    | 7 ++++---
 security/manager/ssl/src/nsDataSignatureVerifier.h | 3 ++-
 security/manager/ssl/src/nsKeyModule.h             | 5 +++--
 security/manager/ssl/src/nsNSSCallbacks.h          | 3 ++-
 security/manager/ssl/src/nsNSSVersion.h            | 3 ++-
 security/manager/ssl/src/nsRandomGenerator.h       | 3 ++-
 security/manager/ssl/src/nsRecentBadCerts.h        | 2 +-
 security/manager/ssl/src/nsStreamCipher.h          | 3 ++-
 12 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/security/manager/pki/src/nsFormSigningDialog.h b/security/manager/pki/src/nsFormSigningDialog.h
index 84c07d4352e..b48827d9fa8 100644
--- a/security/manager/pki/src/nsFormSigningDialog.h
+++ b/security/manager/pki/src/nsFormSigningDialog.h
@@ -6,12 +6,13 @@
 #define __NS_NSFORMSIGNINGDIALOG_H__
 
 #include "nsIFormSigningDialog.h"
+#include "mozilla/Attributes.h"
 
 #define NS_FORMSIGNINGDIALOG_CID \
   { 0xa4bd2161, 0x7892, 0x4389, \
     { 0x8d, 0x5a, 0x31, 0x11, 0xa6, 0xd1, 0x7e, 0xc7 }}
 
-class nsFormSigningDialog : public nsIFormSigningDialog
+class nsFormSigningDialog MOZ_FINAL : public nsIFormSigningDialog
 {
 public:
   nsFormSigningDialog();
diff --git a/security/manager/ssl/src/NSSErrorsService.h b/security/manager/ssl/src/NSSErrorsService.h
index a180977c012..a270f958618 100644
--- a/security/manager/ssl/src/NSSErrorsService.h
+++ b/security/manager/ssl/src/NSSErrorsService.h
@@ -6,11 +6,12 @@
 
 #include "nsIStringBundle.h"
 #include "nsCOMPtr.h"
+#include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace psm {
 
-class NSSErrorsService : public nsINSSErrorsService
+class NSSErrorsService MOZ_FINAL : public nsINSSErrorsService
 {
   NS_DECL_ISUPPORTS
   NS_DECL_NSINSSERRORSSERVICE
diff --git a/security/manager/ssl/src/nsCertOverrideService.h b/security/manager/ssl/src/nsCertOverrideService.h
index aa54bea2f38..d39c7471690 100644
--- a/security/manager/ssl/src/nsCertOverrideService.h
+++ b/security/manager/ssl/src/nsCertOverrideService.h
@@ -15,6 +15,7 @@
 #include "nsIFile.h"
 #include "secoidt.h"
 #include "nsWeakReference.h"
+#include "mozilla/Attributes.h"
 
 class nsCertOverride
 {
@@ -62,7 +63,7 @@ public:
 
 
 // hash entry class
-class nsCertOverrideEntry : public PLDHashEntryHdr
+class nsCertOverrideEntry MOZ_FINAL : public PLDHashEntryHdr
 {
   public:
     // Hash methods
@@ -125,9 +126,9 @@ class nsCertOverrideEntry : public PLDHashEntryHdr
     nsCString mHostWithPort;
 };
 
-class nsCertOverrideService : public nsICertOverrideService
-                            , public nsIObserver
-                            , public nsSupportsWeakReference
+class nsCertOverrideService MOZ_FINAL : public nsICertOverrideService
+                                      , public nsIObserver
+                                      , public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/security/manager/ssl/src/nsCertTree.h b/security/manager/ssl/src/nsCertTree.h
index 584d36205e0..f45869c606d 100644
--- a/security/manager/ssl/src/nsCertTree.h
+++ b/security/manager/ssl/src/nsCertTree.h
@@ -18,6 +18,7 @@
 #include "pldhash.h"
 #include "nsIX509CertDB.h"
 #include "nsCertOverrideService.h"
+#include "mozilla/Attributes.h"
 
 
 typedef struct treeArrayElStr treeArrayEl;
@@ -37,7 +38,7 @@ struct CompareCacheHashEntryPtr : PLDHashEntryHdr {
   CompareCacheHashEntry *entry;
 };
 
-class nsCertAddonInfo : public nsISupports
+class nsCertAddonInfo MOZ_FINAL : public nsISupports
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/security/manager/ssl/src/nsClientAuthRemember.h b/security/manager/ssl/src/nsClientAuthRemember.h
index 476e9168ee3..7ef3078d93a 100644
--- a/security/manager/ssl/src/nsClientAuthRemember.h
+++ b/security/manager/ssl/src/nsClientAuthRemember.h
@@ -15,6 +15,7 @@
 #include "nsNSSCertificate.h"
 #include "nsString.h"
 #include "nsWeakReference.h"
+#include "mozilla/Attributes.h"
 
 class nsClientAuthRemember
 {
@@ -44,7 +45,7 @@ public:
 
 
 // hash entry class
-class nsClientAuthRememberEntry : public PLDHashEntryHdr
+class nsClientAuthRememberEntry MOZ_FINAL : public PLDHashEntryHdr
 {
   public:
     // Hash methods
@@ -106,8 +107,8 @@ class nsClientAuthRememberEntry : public PLDHashEntryHdr
     nsCString mHostWithCert;
 };
 
-class nsClientAuthRememberService : public nsIObserver,
-                                    public nsSupportsWeakReference
+class nsClientAuthRememberService MOZ_FINAL : public nsIObserver,
+                                              public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/security/manager/ssl/src/nsDataSignatureVerifier.h b/security/manager/ssl/src/nsDataSignatureVerifier.h
index ef385835614..109004c6550 100644
--- a/security/manager/ssl/src/nsDataSignatureVerifier.h
+++ b/security/manager/ssl/src/nsDataSignatureVerifier.h
@@ -6,6 +6,7 @@
 #define _NS_DATASIGNATUREVERIFIER_H_
 
 #include "nsIDataSignatureVerifier.h"
+#include "mozilla/Attributes.h"
 
 #include "keythi.h"
 
@@ -16,7 +17,7 @@
 #define NS_DATASIGNATUREVERIFIER_CONTRACTID \
     "@mozilla.org/security/datasignatureverifier;1"
 
-class nsDataSignatureVerifier : public nsIDataSignatureVerifier
+class nsDataSignatureVerifier MOZ_FINAL : public nsIDataSignatureVerifier
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/security/manager/ssl/src/nsKeyModule.h b/security/manager/ssl/src/nsKeyModule.h
index f0688a73c21..4f47654a2b9 100644
--- a/security/manager/ssl/src/nsKeyModule.h
+++ b/security/manager/ssl/src/nsKeyModule.h
@@ -7,6 +7,7 @@
 
 #include "nsIKeyModule.h"
 #include "pk11pub.h"
+#include "mozilla/Attributes.h"
 
 #define NS_KEYMODULEOBJECT_CLASSNAME "Key Object Component"
 /* eae599aa-ecef-49c6-a8af-6ddcc6feb484 */
@@ -21,7 +22,7 @@
 #define NS_KEYMODULEOBJECTFACTORY_CONTRACTID \
 "@mozilla.org/security/keyobjectfactory;1"
 
-class nsKeyObject : public nsIKeyObject
+class nsKeyObject MOZ_FINAL : public nsIKeyObject
 {
 public:
   nsKeyObject();
@@ -48,7 +49,7 @@ private:
 };
 
 
-class nsKeyObjectFactory : public nsIKeyObjectFactory
+class nsKeyObjectFactory MOZ_FINAL : public nsIKeyObjectFactory
 {
 public:
   nsKeyObjectFactory();
diff --git a/security/manager/ssl/src/nsNSSCallbacks.h b/security/manager/ssl/src/nsNSSCallbacks.h
index eab81d7af4b..e14481c6977 100644
--- a/security/manager/ssl/src/nsNSSCallbacks.h
+++ b/security/manager/ssl/src/nsNSSCallbacks.h
@@ -13,6 +13,7 @@
 #include "nsIStreamLoader.h"
 #include "mozilla/CondVar.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/Attributes.h"
 
 char* PR_CALLBACK
 PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg);
@@ -22,7 +23,7 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc *fd, void *client_data);
 SECStatus RegisterMyOCSPAIAInfoCallback();
 SECStatus UnregisterMyOCSPAIAInfoCallback();
 
-class nsHTTPListener : public nsIStreamLoaderObserver
+class nsHTTPListener MOZ_FINAL : public nsIStreamLoaderObserver
 {
 private:
   // For XPCOM implementations that are not a base class for some other
diff --git a/security/manager/ssl/src/nsNSSVersion.h b/security/manager/ssl/src/nsNSSVersion.h
index b9d3a6aa73c..5dd4203a846 100644
--- a/security/manager/ssl/src/nsNSSVersion.h
+++ b/security/manager/ssl/src/nsNSSVersion.h
@@ -7,8 +7,9 @@
 #define _NS_NSSVERSION_H_
 
 #include "nsINSSVersion.h"
+#include "mozilla/Attributes.h"
 
-class nsNSSVersion : public nsINSSVersion
+class nsNSSVersion MOZ_FINAL : public nsINSSVersion
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/security/manager/ssl/src/nsRandomGenerator.h b/security/manager/ssl/src/nsRandomGenerator.h
index 97caabeb328..864ef7229c7 100644
--- a/security/manager/ssl/src/nsRandomGenerator.h
+++ b/security/manager/ssl/src/nsRandomGenerator.h
@@ -6,6 +6,7 @@
 #define _NSRANDOMGENERATOR_H_
 
 #include "nsIRandomGenerator.h"
+#include "mozilla/Attributes.h"
 
 #define NS_RANDOMGENERATOR_CID \
   {0xbe65e2b7, 0xfe46, 0x4e0f, {0x88, 0xe0, 0x4b, 0x38, 0x5d, 0xb4, 0xd6, 0x8a}}
@@ -13,7 +14,7 @@
 #define NS_RANDOMGENERATOR_CONTRACTID \
   "@mozilla.org/security/random-generator;1"
 
-class nsRandomGenerator : public nsIRandomGenerator
+class nsRandomGenerator MOZ_FINAL : public nsIRandomGenerator
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/security/manager/ssl/src/nsRecentBadCerts.h b/security/manager/ssl/src/nsRecentBadCerts.h
index 50fc7e567a4..d8b6b6c12c2 100644
--- a/security/manager/ssl/src/nsRecentBadCerts.h
+++ b/security/manager/ssl/src/nsRecentBadCerts.h
@@ -53,7 +53,7 @@ private:
   RecentBadCert &operator=(const RecentBadCert &other) MOZ_DELETE;
 };
 
-class nsRecentBadCertsService : public nsIRecentBadCertsService
+class nsRecentBadCertsService MOZ_FINAL : public nsIRecentBadCertsService
 {
 public:
   NS_DECL_ISUPPORTS
diff --git a/security/manager/ssl/src/nsStreamCipher.h b/security/manager/ssl/src/nsStreamCipher.h
index 87ed7d1a039..3e884c2f8ab 100644
--- a/security/manager/ssl/src/nsStreamCipher.h
+++ b/security/manager/ssl/src/nsStreamCipher.h
@@ -8,6 +8,7 @@
 #include "nsIStreamCipher.h"
 #include "nsString.h"
 #include "pk11func.h"
+#include "mozilla/Attributes.h"
 
 #define NS_STREAMCIPHER_CLASSNAME  "Stream Cipher Component"
 /* dbfcbe4a-10f7-4d6f-a481-68e6d6b71d21 */
@@ -15,7 +16,7 @@
 { 0xdbfcbe4a, 0x10f7, 0x4d6f, {0xa4, 0x81, 0x68, 0xe6, 0xd6, 0xb7, 0x1d, 0x21}}
 #define NS_STREAMCIPHER_CONTRACTID "@mozilla.org/security/streamcipher;1"
 
-class nsStreamCipher : public nsIStreamCipher
+class nsStreamCipher MOZ_FINAL : public nsIStreamCipher
 {
 public:
   nsStreamCipher();

From 1a654170cf9aa39fb85096ff1c1ec6956df2a76e Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:39:40 -0400
Subject: [PATCH 108/118] Bug 758992 - Make the classes which use the XPCOM
 nsISupports implementation macros final, to avoid the warning about deleting
 using a pointer to a base class with virtual functions and no virtual dtor
 (spellchecker parts); blanket-r=bzbarsky

---
 extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h b/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h
index 651200d83df..acbc6ace7e0 100644
--- a/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h
+++ b/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h
@@ -38,8 +38,9 @@
 
 #include "nsIDirectoryService.h"
 #include "nsISimpleEnumerator.h"
+#include "mozilla/Attributes.h"
 
-class mozHunspellDirProvider :
+class mozHunspellDirProvider MOZ_FINAL :
   public nsIDirectoryServiceProvider2
 {
 public:
@@ -50,7 +51,7 @@ public:
   static char const *const kContractID;
 
 private:
-  class AppendingEnumerator : public nsISimpleEnumerator
+  class AppendingEnumerator MOZ_FINAL : public nsISimpleEnumerator
   {
   public:
     NS_DECL_ISUPPORTS

From 7b80af8185025ad60a920b7c1e137afcdd7b00e6 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:41:52 -0400
Subject: [PATCH 109/118] Silence the warning about empty while body loop in
 clang (no bug)

---
 extensions/spellcheck/hunspell/src/affentry.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/spellcheck/hunspell/src/affentry.cpp b/extensions/spellcheck/hunspell/src/affentry.cpp
index 8ae3d5416c3..13247560cae 100644
--- a/extensions/spellcheck/hunspell/src/affentry.cpp
+++ b/extensions/spellcheck/hunspell/src/affentry.cpp
@@ -597,7 +597,8 @@ inline int SfxEntry::test_condition(const char * st, const char * beg)
                         if (neg) return 0;
                         else if (i == numconds) return 1;
                         ingroup = true;
-			while (p && *p != ']' && (p = nextchar(p)));
+			while (p && *p != ']' && (p = nextchar(p)))
+                          ;
 //			if (p && *p != ']') p = nextchar(p);
                         st--;
                     }

From 850bd5cad2d2e727d278de34341be90b36f5c2ae Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:42:48 -0400
Subject: [PATCH 110/118] Bug 758992 - Make the classes which use the XPCOM
 nsISupports implementation macros final, to avoid the warning about deleting
 using a pointer to a base class with virtual functions and no virtual dtor
 (tools/profiler parts); blanket-r=bzbarsky

---
 tools/profiler/nsProfiler.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/profiler/nsProfiler.h b/tools/profiler/nsProfiler.h
index c16b1d044ae..e59cb3f11f2 100644
--- a/tools/profiler/nsProfiler.h
+++ b/tools/profiler/nsProfiler.h
@@ -7,8 +7,9 @@
 #define _NSPROFILER_H_
 
 #include "nsIProfiler.h"
+#include "mozilla/Attributes.h"
 
-class nsProfiler : public nsIProfiler
+class nsProfiler MOZ_FINAL : public nsIProfiler
 {
 public:
     nsProfiler();

From 1c50b4958d92021a987cabb4228a98991ab62ec3 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:45:35 -0400
Subject: [PATCH 111/118] Remove the unused variable (no bug)

---
 tools/profiler/TableTicker.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index ad94cf508fc..b1bd6bfd012 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -599,7 +599,6 @@ JSObject* TableTicker::ToJSObject(JSContext *aCx)
   JSObject *profile = b.CreateObject();
 
   // Put shared library info
-  JSObject *libs = GetMetaJSObject(b);
   b.DefineProperty(profile, "libs", GetSharedLibraryInfoString().c_str());
 
   // Put meta data

From 9f34984aed484e7b602e802abd34109dcc61f254 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:47:09 -0400
Subject: [PATCH 112/118] Remove two unused variables in the accessibility code
 (no bug)

---
 accessible/src/html/HTMLTableAccessible.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/accessible/src/html/HTMLTableAccessible.cpp b/accessible/src/html/HTMLTableAccessible.cpp
index dff8fcde84c..bc3b900f2f7 100644
--- a/accessible/src/html/HTMLTableAccessible.cpp
+++ b/accessible/src/html/HTMLTableAccessible.cpp
@@ -766,7 +766,7 @@ HTMLTableAccessible::ColExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
   bool isSelected;
   PRInt32 columnExtent = 0;
 
-  nsresult rv = tableLayout->
+  tableLayout->
     GetCellDataAt(aRowIdx, aColIdx, *getter_AddRefs(domElement),
                   startRowIndex, startColIndex, rowSpan, colSpan,
                   actualRowSpan, columnExtent, isSelected);
@@ -786,7 +786,7 @@ HTMLTableAccessible::RowExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
   bool isSelected;
   PRInt32 rowExtent = 0;
 
-  nsresult rv = tableLayout->
+  tableLayout->
     GetCellDataAt(aRowIdx, aColIdx, *getter_AddRefs(domElement),
                   startRowIndex, startColIndex, rowSpan, colSpan,
                   rowExtent, actualColSpan, isSelected);

From f7b31bffdf31db39e1b328682eda9255f16ed87d Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:48:45 -0400
Subject: [PATCH 113/118] Bug 758992 - Make the classes which use the XPCOM
 nsISupports implementation macros final, to avoid the warning about deleting
 using a pointer to a base class with virtual functions and no virtual dtor
 (accessibility parts); blanket-r=bzbarsky

---
 accessible/src/base/nsAccessiblePivot.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/accessible/src/base/nsAccessiblePivot.h b/accessible/src/base/nsAccessiblePivot.h
index 0c81fe54519..feffe31dd22 100644
--- a/accessible/src/base/nsAccessiblePivot.h
+++ b/accessible/src/base/nsAccessiblePivot.h
@@ -12,6 +12,7 @@
 #include "nsAutoPtr.h"
 #include "nsTObserverArray.h"
 #include "nsCycleCollectionParticipant.h"
+#include "mozilla/Attributes.h"
 
 class Accessible;
 class nsIAccessibleTraversalRule;
@@ -23,7 +24,7 @@ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 0x26)
 /**
  * Class represents an accessible pivot.
  */
-class nsAccessiblePivot: public nsIAccessiblePivot
+class nsAccessiblePivot MOZ_FINAL : public nsIAccessiblePivot
 {
 public:
   nsAccessiblePivot(Accessible* aRoot);

From 82448a9e9523b42c85d1bac6c21229b421c1d427 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 00:49:48 -0400
Subject: [PATCH 114/118] Bug 758992 - Make the classes which use the XPCOM
 nsISupports implementation macros final, to avoid the warning about deleting
 using a pointer to a base class with virtual functions and no virtual dtor
 (xpfe/appshell parts); blanket-r=bzbarsky

---
 xpfe/appshell/src/nsAppShellService.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xpfe/appshell/src/nsAppShellService.h b/xpfe/appshell/src/nsAppShellService.h
index fcaebea589d..8241f7740af 100644
--- a/xpfe/appshell/src/nsAppShellService.h
+++ b/xpfe/appshell/src/nsAppShellService.h
@@ -13,13 +13,14 @@
 #include "nsWebShellWindow.h"
 #include "nsStringFwd.h"
 #include "nsAutoPtr.h"
+#include "mozilla/Attributes.h"
 
 // {0099907D-123C-4853-A46A-43098B5FB68C}
 #define NS_APPSHELLSERVICE_CID \
 { 0x99907d, 0x123c, 0x4853, { 0xa4, 0x6a, 0x43, 0x9, 0x8b, 0x5f, 0xb6, 0x8c } }
 
-class nsAppShellService : public nsIAppShellService,
-                          public nsIObserver
+class nsAppShellService MOZ_FINAL : public nsIAppShellService,
+                                    public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS

From 2864299ab6e4e27512df6a3c09bca12f48826c37 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 19 Jul 2012 01:20:59 -0400
Subject: [PATCH 115/118] Backout changeset be1e9d076b8a (bug 755136) because
 of mochitest-oth leaks on debug builds

---
 browser/app/profile/firefox.js                |   3 +-
 browser/base/content/browser-sets.inc         |   2 -
 browser/base/content/browser-social.js        |  65 +----
 browser/base/content/browser.xul              |  17 --
 browser/base/content/test/Makefile.in         |   1 -
 .../base/content/test/browser_shareButton.js  |   1 +
 .../content/test/browser_social_sidebar.js    |  74 ------
 .../content/test/browser_social_toolbar.js    |  11 +-
 .../locales/en-US/chrome/browser/browser.dtd  |   2 -
 browser/modules/Social.jsm                    |   9 +-
 toolkit/components/social/SocialService.jsm   | 224 +++++++++---------
 11 files changed, 125 insertions(+), 284 deletions(-)
 delete mode 100644 browser/base/content/test/browser_social_sidebar.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 0107c6600d4..1616359f358 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1184,5 +1184,4 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
 pref("image.mem.max_decoded_image_kb", 256000);
 
 // Example social provider
-pref("social.manifest.motown", "{\"origin\":\"https://motown-dev.mozillalabs.com\",\"name\":\"MoTown\",\"workerURL\":\"https://motown-dev.mozillalabs.com/social/worker.js\",\"iconURL\":\"https://motown-dev.mozillalabs.com/images/motown-icon.png\",\"sidebarURL\":\"https://motown-dev.mozillalabs.com/social/sidebar\"}");
-pref("social.sidebar.open", true);
+pref("social.manifest.motown", "{\"origin\":\"https://motown-dev.mozillalabs.com\",\"name\":\"MoTown\",\"workerURL\":\"https://motown-dev.mozillalabs.com/social/worker.js\",\"iconURL\":\"https://motown-dev.mozillalabs.com/images/motown-icon.png\"}");
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 649526c09d5..4d8404ef59b 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -107,7 +107,6 @@
     <command id="Browser:ToggleAddonBar" oncommand="toggleAddonBar();"/>
     <command id="Social:SharePage" oncommand="SocialShareButton.sharePage();"/>
     <command id="Social:UnsharePage" oncommand="SocialShareButton.unsharePage();"/>
-    <command id="Social:ToggleSidebar" oncommand="Social.toggleSidebar();"/>
   </commandset>
 
   <commandset id="placesCommands">
@@ -182,7 +181,6 @@
     <broadcaster id="sync-syncnow-state"/>
 #endif
     <broadcaster id="workOfflineMenuitemState"/>
-    <broadcaster id="socialSidebarBroadcaster" hidden="true"/>
   </broadcasterset>
 
   <keyset id="mainKeyset">
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 1a08ff75449..b6055bd8476 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -9,8 +9,6 @@ let SocialUI = {
     Services.obs.addObserver(this, "social:ambient-notification-changed", false);
     Services.obs.addObserver(this, "social:profile-changed", false);
 
-    Services.prefs.addObserver("social.sidebar.open", this, false);
-
     Social.init(this._providerReady.bind(this));
   },
 
@@ -19,8 +17,6 @@ let SocialUI = {
     Services.obs.removeObserver(this, "social:pref-changed");
     Services.obs.removeObserver(this, "social:ambient-notification-changed");
     Services.obs.removeObserver(this, "social:profile-changed");
-
-    Services.prefs.removeObserver("social.sidebar.open", this);
   },
 
   showProfile: function SocialUI_showProfile() {
@@ -33,7 +29,6 @@ let SocialUI = {
       case "social:pref-changed":
         SocialShareButton.updateButtonHiddenState();
         SocialToolbar.updateButtonHiddenState();
-        SocialSidebar.updateSidebar();
         break;
       case "social:ambient-notification-changed":
         SocialToolbar.updateButton();
@@ -41,8 +36,6 @@ let SocialUI = {
       case "social:profile-changed":
         SocialToolbar.updateProfile();
         break;
-      case "nsPref:changed":
-        SocialSidebar.updateSidebar();
     }
   },
 
@@ -50,13 +43,12 @@ let SocialUI = {
   _providerReady: function SocialUI_providerReady() {
     SocialToolbar.init();
     SocialShareButton.init();
-    SocialSidebar.init();
   }
 }
 
 let SocialShareButton = {
-  // Called once, after window load, when the Social.provider object is initialized
   init: function SSB_init() {
+    this.sharePopup.hidden = false;
     this.updateButtonHiddenState();
 
     let profileRow = document.getElementById("editSharePopupHeader");
@@ -106,8 +98,6 @@ let SocialShareButton = {
   },
 
   sharePage: function SSB_sharePage() {
-    this.sharePopup.hidden = false;
-
     let uri = gBrowser.currentURI;
     if (!Social.isPageShared(uri)) {
       Social.sharePage(uri);
@@ -258,60 +248,9 @@ var SocialToolbar = {
       notifBrowser.setAttribute("src", "about:blank");
     });
 
-    notifBrowser.setAttribute("origin", Social.provider.origin);
+    notifBrowser.service = Social.provider;
     notifBrowser.setAttribute("src", iconImage.getAttribute("contentPanel"));
     document.getElementById("social-toolbar-button").setAttribute("open", "true");
     panel.openPopup(iconImage, "bottomcenter topleft", 0, 0, false, false);
   }
 }
-
-var SocialSidebar = {
-  // Called once, after window load, when the Social.provider object is initialized
-  init: function SocialSidebar_init() {
-    this.updateSidebar();
-  },
-
-  // Whether the sidebar can be shown for this window.
-  get canShow() {
-    return Social.uiVisible && Social.provider.sidebarURL && !this.chromeless;
-  },
-
-  // Whether this is a "chromeless window" (e.g. popup window). We don't show
-  // the sidebar in these windows.
-  get chromeless() {
-    let docElem = document.documentElement;
-    return docElem.getAttribute('disablechrome') ||
-           docElem.getAttribute('chromehidden').indexOf("extrachrome") >= 0;
-  },
-
-  // Whether the user has toggled the sidebar on (for windows where it can appear)
-  get enabled() {
-    return Services.prefs.getBoolPref("social.sidebar.open");
-  },
-
-  updateSidebar: function SocialSidebar_updateSidebar() {
-    // Hide the toggle menu item if the sidebar cannot appear
-    let command = document.getElementById("Social:ToggleSidebar");
-    command.hidden = !this.canShow;
-
-    // Hide the sidebar if it cannot appear, or has been toggled off.
-    // Also set the command "checked" state accordingly.
-    let hideSidebar = !this.canShow || !this.enabled;
-    let broadcaster = document.getElementById("socialSidebarBroadcaster");
-    broadcaster.hidden = hideSidebar;
-    command.setAttribute("checked", !hideSidebar);
-
-    // If the sidebar is hidden, unload its document
-    // XXX this results in a poor UX, we should revisit
-    let sbrowser = document.getElementById("social-sidebar-browser");
-    if (broadcaster.hidden) {
-      sbrowser.removeAttribute("origin");
-      sbrowser.setAttribute("src", "about:blank");
-      return;
-    }
-
-    // Load the sidebar document
-    sbrowser.setAttribute("origin", Social.provider.origin);
-    sbrowser.setAttribute("src", Social.provider.sidebarURL);
-  }
-}
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index bc395c96791..20c4708acfc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -638,12 +638,6 @@
                           oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/>
                 </vbox>
               </hbox>
-              <menuitem id="social-toggle-sidebar-menuitem"
-                        type="checkbox"
-                        autocheck="false"
-                        command="Social:ToggleSidebar"
-                        label="&social.toggleSidebar.label;"
-                        accesskey="&social.toggleSidebar.accesskey;"/>
             </menupopup>
           </button>
           <hbox id="social-status-iconbox" flex="1">
@@ -1030,17 +1024,6 @@
                   onclick="contentAreaClick(event, false);"/>
       <statuspanel id="statusbar-display" inactive="true"/>
     </vbox>
-    <splitter id="social-sidebar-splitter"
-              class="chromeclass-extrachrome"
-              observes="socialSidebarBroadcaster"/>
-    <vbox id="social-sidebar-box"
-          class="chromeclass-extrachrome"
-          observes="socialSidebarBroadcaster">
-      <browser id="social-sidebar-browser"
-               type="content"
-               flex="1"
-               style="min-width: 14em; width: 18em; max-width: 36em;"/>
-    </vbox>
     <splitter id="devtools-side-splitter" hidden="true"/>
     <vbox id="devtools-sidebar-box" hidden="true"
           style="min-width: 18em; width: 22em; max-width: 42em;" persist="width">
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 8fb493063f8..06ceeefec87 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -257,7 +257,6 @@ _BROWSER_FILES = \
                  browser_lastAccessedTab.js \
                  browser_bug734076.js \
                  browser_social_toolbar.js \
-                 browser_social_sidebar.js \
                  $(NULL)
 
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/browser/base/content/test/browser_shareButton.js b/browser/base/content/test/browser_shareButton.js
index c5037793c69..9499940a561 100644
--- a/browser/base/content/test/browser_shareButton.js
+++ b/browser/base/content/test/browser_shareButton.js
@@ -51,6 +51,7 @@ function testInitial() {
   sharePopup = SocialShareButton.sharePopup;
   ok(shareButton, "share button exists");
   ok(sharePopup, "share popup exists");
+  ok(!sharePopup.hidden, "share popup is not hidden");
 
   okButton = document.getElementById("editSharePopupOkButton");
   undoButton = document.getElementById("editSharePopupUndoButton");
diff --git a/browser/base/content/test/browser_social_sidebar.js b/browser/base/content/test/browser_social_sidebar.js
deleted file mode 100644
index f5a8b472822..00000000000
--- a/browser/base/content/test/browser_social_sidebar.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-let SocialService = Cu.import("resource://gre/modules/SocialService.jsm", {}).SocialService;
-
-function test() {
-  waitForExplicitFinish();
-
-  let oldProvider;
-  function saveOldProviderAndStartTestWith(provider) {
-    oldProvider = Social.provider;
-    registerCleanupFunction(function () {
-      Social.provider = oldProvider;
-    });
-    Social.provider = provider;
-
-    // Now that we've set the UI's provider, enable the social functionality
-    Services.prefs.setBoolPref("social.enabled", true);
-    registerCleanupFunction(function () {
-      Services.prefs.clearUserPref("social.enabled");
-    });
-
-    doTest();
-  }
-
-  let manifest = { // normal provider
-    name: "provider 1",
-    origin: "https://example1.com",
-    sidebarURL: "https://example1.com/sidebar.html",
-    workerURL: "https://example1.com/worker.js",
-    iconURL: "chrome://branding/content/icon48.png"
-  };
-  SocialService.addProvider(manifest, function(provider) {
-    // If the UI is already active, run the test immediately, otherwise wait
-    // for initialization.
-    if (Social.provider) {
-      saveOldProviderAndStartTestWith(provider);
-    } else {
-      Services.obs.addObserver(function obs() {
-        Services.obs.removeObserver(obs, "test-social-ui-ready");
-        saveOldProviderAndStartTestWith(provider);
-      }, "test-social-ui-ready", false);
-    }
-  });
-}
-
-function doTest() {
-  ok(SocialSidebar.canShow, "social sidebar should be able to be shown");
-  ok(SocialSidebar.enabled, "social sidebar should be on by default");
-
-  let command = document.getElementById("Social:ToggleSidebar");
-  let sidebar = document.getElementById("social-sidebar-box");
-
-  // Check the the sidebar is initially visible, and loaded
-  ok(!command.hidden, "sidebar toggle command should be visible");
-  is(command.getAttribute("checked"), "true", "sidebar toggle command should be checked");
-  ok(!sidebar.hidden, "sidebar itself should be visible");
-  ok(Services.prefs.getBoolPref("social.sidebar.open"), "sidebar open pref should be true");
-  is(sidebar.firstChild.getAttribute('src'), "https://example1.com/sidebar.html", "sidebar url should be set");
-
-  // Now toggle it!
-  info("Toggling sidebar");
-  Social.toggleSidebar();
-  is(command.getAttribute("checked"), "false", "sidebar toggle command should not be checked");
-  ok(sidebar.hidden, "sidebar itself should not be visible");
-  ok(!Services.prefs.getBoolPref("social.sidebar.open"), "sidebar open pref should be false");
-  is(sidebar.firstChild.getAttribute('src'), "about:blank", "sidebar url should not be set");
-
-  // Remove the test provider
-  SocialService.removeProvider(Social.provider.origin, finish);
-}
-
-// XXX test sidebar in popup
diff --git a/browser/base/content/test/browser_social_toolbar.js b/browser/base/content/test/browser_social_toolbar.js
index afc043185de..f38092d1fad 100644
--- a/browser/base/content/test/browser_social_toolbar.js
+++ b/browser/base/content/test/browser_social_toolbar.js
@@ -8,6 +8,11 @@ let gProvider;
 function test() {
   waitForExplicitFinish();
 
+  Services.prefs.setBoolPref("social.enabled", true);
+  registerCleanupFunction(function () {
+    Services.prefs.clearUserPref("social.enabled");
+  });
+
   let oldProvider;
   function saveOldProviderAndStartTestWith(provider) {
     oldProvider = Social.provider;
@@ -15,12 +20,6 @@ function test() {
       Social.provider = oldProvider;
     });
     Social.provider = gProvider = provider;
-
-    Services.prefs.setBoolPref("social.enabled", true);
-    registerCleanupFunction(function () {
-      Services.prefs.clearUserPref("social.enabled");
-    });
-
     runTests(tests, undefined, undefined, function () {
       SocialService.removeProvider(provider.origin, finish);
     });
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index b646cba54ac..63457f26729 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -662,5 +662,3 @@ toolbar button -->
 <!ENTITY social.sharePopup.ok.accesskey   "O">
 <!ENTITY social.sharePopup.shared.label   "You shared this page.">
 <!ENTITY social.sharePopup.portrait.arialabel "User profile picture">
-<!ENTITY social.toggleSidebar.label "Show sidebar">
-<!ENTITY social.toggleSidebar.accesskey "s">
diff --git a/browser/modules/Social.jsm b/browser/modules/Social.jsm
index 23c4333016e..ea7a7ea57fb 100644
--- a/browser/modules/Social.jsm
+++ b/browser/modules/Social.jsm
@@ -34,13 +34,12 @@ let Social = {
     }.bind(this));
   },
 
-  get uiVisible() {
-    return this.provider && this.provider.enabled && this.provider.port;
+  get enabled() {
+    return SocialService.enabled;
   },
 
-  toggleSidebar: function SocialSidebar_toggle() {
-    let prefValue = Services.prefs.getBoolPref("social.sidebar.open");
-    Services.prefs.setBoolPref("social.sidebar.open", !prefValue);
+  get uiVisible() {
+    return this.provider && this.provider.enabled && this.provider.port;
   },
 
   sendWorkerMessage: function Social_sendWorkerMessage(message) {
diff --git a/toolkit/components/social/SocialService.jsm b/toolkit/components/social/SocialService.jsm
index f8460afdaa1..0ec7b299944 100644
--- a/toolkit/components/social/SocialService.jsm
+++ b/toolkit/components/social/SocialService.jsm
@@ -12,117 +12,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "getFrameWorkerHandle", "resource://gre/modules/FrameWorker.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "WorkerAPI", "resource://gre/modules/WorkerAPI.jsm");
 
-/**
- * The SocialService is the public API to social providers - it tracks which
- * providers are installed and enabled, and is the entry-point for access to
- * the provider itself.
- */
-
-// Internal helper methods and state
-let SocialServiceInternal = {
-  enabled: Services.prefs.getBoolPref("social.enabled"),
-  get providerArray() {
-    return [p for ([, p] of Iterator(this.providers))];
-  }
-};
-
-XPCOMUtils.defineLazyGetter(SocialServiceInternal, "providers", function () {
-  // Initialize the service (add a pref observer)
-  function prefObserver(subject, topic, data) {
-    SocialService._setEnabled(Services.prefs.getBoolPref(data));
-  }
-  Services.prefs.addObserver("social.enabled", prefObserver, false);
-  Services.obs.addObserver(function xpcomShutdown() {
-    Services.obs.removeObserver(xpcomShutdown, "xpcom-shutdown");
-    Services.prefs.removeObserver("social.enabled", prefObserver);
-  }, "xpcom-shutdown", false);
-
-  // Now retrieve the providers
-  let providers = {};
-  let MANIFEST_PREFS = Services.prefs.getBranch("social.manifest.");
-  let prefs = MANIFEST_PREFS.getChildList("", {});
-  prefs.forEach(function (pref) {
-    try {
-      var manifest = JSON.parse(MANIFEST_PREFS.getCharPref(pref));
-      if (manifest && typeof(manifest) == "object") {
-        let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
-        providers[provider.origin] = provider;
-      }
-    } catch (err) {
-      Cu.reportError("SocialService: failed to load provider: " + pref +
-                     ", exception: " + err);
-    }
-  });
-
-  return providers;
-});
-
-function schedule(callback) {
-  Services.tm.mainThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL);
-}
-
-// Public API
-const SocialService = {
-  get enabled() {
-    return SocialServiceInternal.enabled;
-  },
-  set enabled(val) {
-    let enable = !!val;
-    if (enable == SocialServiceInternal.enabled)
-      return;
-
-    Services.prefs.setBoolPref("social.enabled", enable);
-    this._setEnabled(enable);
-  },
-  _setEnabled: function _setEnabled(enable) {
-    SocialServiceInternal.providerArray.forEach(function (p) p.enabled = enable);
-    SocialServiceInternal.enabled = enable;
-    Services.obs.notifyObservers(null, "social:pref-changed", enable ? "enabled" : "disabled");
-  },
-
-  // Adds a provider given a manifest, and returns the added provider.
-  addProvider: function addProvider(manifest, onDone) {
-    if (SocialServiceInternal.providers[manifest.origin])
-      throw new Error("SocialService.addProvider: provider with this origin already exists");
-
-    let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
-    SocialServiceInternal.providers[provider.origin] = provider;
-
-    schedule(function () {
-      onDone(provider);
-    });
-  },
-
-  // Removes a provider with the given origin, and notifies when the removal is
-  // complete.
-  removeProvider: function removeProvider(origin, onDone) {
-    if (!(origin in SocialServiceInternal.providers))
-      throw new Error("SocialService.removeProvider: no provider with this origin exists!");
-
-    let provider = SocialServiceInternal.providers[origin];
-    provider.enabled = false;
-
-    delete SocialServiceInternal.providers[origin];
-
-    if (onDone)
-      schedule(onDone);
-  },
-
-  // Returns a single provider object with the specified origin.
-  getProvider: function getProvider(origin, onDone) {
-    schedule((function () {
-      onDone(SocialServiceInternal.providers[origin] || null);
-    }).bind(this));
-  },
-
-  // Returns an array of installed provider origins.
-  getProviderList: function getProviderList(onDone) {
-    schedule(function () {
-      onDone(SocialServiceInternal.providerArray);
-    });
-  }
-};
-
 /**
  * The SocialProvider object represents a social provider, and allows
  * access to its FrameWorker (if it has one).
@@ -140,7 +29,6 @@ function SocialProvider(input, enabled) {
   this.name = input.name;
   this.iconURL = input.iconURL;
   this.workerURL = input.workerURL;
-  this.sidebarURL = input.sidebarURL;
   this.origin = input.origin;
   this.ambientNotificationIcons = {};
 
@@ -265,3 +153,115 @@ SocialProvider.prototype = {
     }
   }
 }
+
+/**
+ * The SocialService is the public API to social providers - it tracks which
+ * providers are installed and enabled, and is the entry-point for access to
+ * the provider itself.
+ */
+
+
+// Internal helper methods and state
+let SocialServiceInternal = {
+  enabled: Services.prefs.getBoolPref("social.enabled"),
+  get providerArray() {
+    return [p for ([, p] of Iterator(this.providers))];
+  }
+};
+
+XPCOMUtils.defineLazyGetter(SocialServiceInternal, "providers", function () {
+  // Initialize the service (add a pref observer)
+  function prefObserver(subject, topic, data) {
+    SocialService._setEnabled(Services.prefs.getBoolPref(data));
+  }
+  Services.prefs.addObserver("social.enabled", prefObserver, false);
+  Services.obs.addObserver(function xpcomShutdown() {
+    Services.obs.removeObserver(xpcomShutdown, "xpcom-shutdown");
+    Services.prefs.removeObserver("social.enabled", prefObserver);
+  }, "xpcom-shutdown", false);
+
+  // Now retrieve the providers
+  let providers = {};
+  let MANIFEST_PREFS = Services.prefs.getBranch("social.manifest.");
+  let prefs = MANIFEST_PREFS.getChildList("", {});
+  prefs.forEach(function (pref) {
+    try {
+      var manifest = JSON.parse(MANIFEST_PREFS.getCharPref(pref));
+      if (manifest && typeof(manifest) == "object") {
+        let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
+        providers[provider.origin] = provider;
+      }
+    } catch (err) {
+      Cu.reportError("SocialService: failed to load provider: " + pref +
+                     ", exception: " + err);
+    }
+  });
+
+  return providers;
+});
+
+function schedule(callback) {
+  Services.tm.mainThread.dispatch(callback, Ci.nsIThread.DISPATCH_NORMAL);
+}
+
+// Public API
+const SocialService = {
+  get enabled() {
+    return SocialServiceInternal.enabled;
+  },
+  set enabled(val) {
+    let enable = !!val;
+    if (enable == SocialServiceInternal.enabled)
+      return;
+
+    Services.prefs.setBoolPref("social.enabled", enable);
+    this._setEnabled(enable);
+  },
+  _setEnabled: function _setEnabled(enable) {
+    SocialServiceInternal.providerArray.forEach(function (p) p.enabled = enable);
+    SocialServiceInternal.enabled = enable;
+    Services.obs.notifyObservers(null, "social:pref-changed", enable ? "enabled" : "disabled");
+  },
+
+  // Adds a provider given a manifest, and returns the added provider.
+  addProvider: function addProvider(manifest, onDone) {
+    if (SocialServiceInternal.providers[manifest.origin])
+      throw new Error("SocialService.addProvider: provider with this origin already exists");
+
+    let provider = new SocialProvider(manifest, SocialServiceInternal.enabled);
+    SocialServiceInternal.providers[provider.origin] = provider;
+
+    schedule(function () {
+      onDone(provider);
+    });
+  },
+
+  // Removes a provider with the given origin, and notifies when the removal is
+  // complete.
+  removeProvider: function removeProvider(origin, onDone) {
+    if (!(origin in SocialServiceInternal.providers))
+      throw new Error("SocialService.removeProvider: no provider with this origin exists!");
+
+    let provider = SocialServiceInternal.providers[origin];
+    provider.enabled = false;
+
+    delete SocialServiceInternal.providers[origin];
+
+    if (onDone)
+      schedule(onDone);
+  },
+
+  // Returns a single provider object with the specified origin.
+  getProvider: function getProvider(origin, onDone) {
+    schedule((function () {
+      onDone(SocialServiceInternal.providers[origin] || null);
+    }).bind(this));
+  },
+
+  // Returns an array of installed provider origins.
+  getProviderList: function getProviderList(onDone) {
+    schedule(function () {
+      onDone(SocialServiceInternal.providerArray);
+    });
+  }
+};

From 213d7fe4cab6e1043eb6fe232b72d7d8692a6ef0 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 19 Jul 2012 12:14:27 +0300
Subject: [PATCH 116/118] Bug 773945, remove nsXULElement::mPrototype, part 4,
 r=bz

---
 content/xul/content/src/nsXULElement.cpp | 317 ++++++++---------------
 content/xul/content/src/nsXULElement.h   |   2 -
 2 files changed, 101 insertions(+), 218 deletions(-)

diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index a821c86bf38..53154210c3f 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -877,76 +877,112 @@ nsXULElement::AfterSetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
                            const nsAttrValue* aValue, bool aNotify)
 {
     if (aNamespaceID == kNameSpaceID_None) {
-        // XXX UnsetAttr handles more attributes than we do. See bug 233642.
-
-        // Add popup and event listeners. We can't call AddListenerFor since
-        // the attribute isn't set yet.
-        MaybeAddPopupListener(aName);
-        if (nsContentUtils::IsEventAttributeName(aName, EventNameType_XUL) && aValue) {
-            if (aValue->Type() == nsAttrValue::eString) {
-                AddScriptEventListener(aName, aValue->GetStringValue(), true);
-            } else {
-                nsAutoString body;
-                aValue->ToString(body);
-                AddScriptEventListener(aName, body, true);
-            }
-        }
-
-        // Hide chrome if needed
-        if (mNodeInfo->Equals(nsGkAtoms::window) && aValue) {
-            if (aName == nsGkAtoms::hidechrome) {
-                HideWindowChrome(
-                  aValue->Equals(NS_LITERAL_STRING("true"), eCaseMatters));
-            }
-            else if (aName == nsGkAtoms::chromemargin) {
-                SetChromeMargins(aValue);
-            }
-        }
-
-        // title, (in)activetitlebarcolor and drawintitlebar are settable on
-        // any root node (windows, dialogs, etc)
-        nsIDocument *document = GetCurrentDoc();
-        if (document && document->GetRootElement() == this) {
-            if (aName == nsGkAtoms::title) {
-                document->NotifyPossibleTitleChange(false);
-            }
-            else if ((aName == nsGkAtoms::activetitlebarcolor ||
-                      aName == nsGkAtoms::inactivetitlebarcolor) && aValue) {
-                nscolor color = NS_RGBA(0, 0, 0, 0);
-                if (aValue->Type() == nsAttrValue::eColor) {
-                    aValue->GetColorValue(color);
+        if (aValue) {
+            // Add popup and event listeners. We can't call AddListenerFor since
+            // the attribute isn't set yet.
+            MaybeAddPopupListener(aName);
+            if (nsContentUtils::IsEventAttributeName(aName, EventNameType_XUL)) {
+                if (aValue->Type() == nsAttrValue::eString) {
+                    AddScriptEventListener(aName, aValue->GetStringValue(), true);
                 } else {
-                    nsAutoString tmp;
-                    nsAttrValue attrValue;
-                    aValue->ToString(tmp);
-                    attrValue.ParseColor(tmp);
-                    attrValue.GetColorValue(color);
-                }
-                SetTitlebarColor(color, aName == nsGkAtoms::activetitlebarcolor);
-            }
-            else if (aName == nsGkAtoms::drawintitlebar) {
-                SetDrawsInTitlebar(aValue &&
-                    aValue->Equals(NS_LITERAL_STRING("true"), eCaseMatters));
-            }
-            else if (aName == nsGkAtoms::localedir) {
-                // if the localedir changed on the root element, reset the document direction
-                nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(document);
-                if (xuldoc) {
-                    xuldoc->ResetDocumentDirection();
+                    nsAutoString body;
+                    aValue->ToString(body);
+                    AddScriptEventListener(aName, body, true);
                 }
             }
-            else if (aName == nsGkAtoms::lwtheme ||
-                     aName == nsGkAtoms::lwthemetextcolor) {
-                // if the lwtheme changed, make sure to reset the document lwtheme cache
-                nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(document);
-                if (xuldoc) {
-                    xuldoc->ResetDocumentLWTheme();
+    
+            // Hide chrome if needed
+            if (mNodeInfo->Equals(nsGkAtoms::window)) {
+                if (aName == nsGkAtoms::hidechrome) {
+                    HideWindowChrome(
+                      aValue->Equals(NS_LITERAL_STRING("true"), eCaseMatters));
+                }
+                else if (aName == nsGkAtoms::chromemargin) {
+                    SetChromeMargins(aValue);
+                }
+            }
+    
+            // title, (in)activetitlebarcolor and drawintitlebar are settable on
+            // any root node (windows, dialogs, etc)
+            nsIDocument *document = GetCurrentDoc();
+            if (document && document->GetRootElement() == this) {
+                if (aName == nsGkAtoms::title) {
+                    document->NotifyPossibleTitleChange(false);
+                }
+                else if ((aName == nsGkAtoms::activetitlebarcolor ||
+                          aName == nsGkAtoms::inactivetitlebarcolor)) {
+                    nscolor color = NS_RGBA(0, 0, 0, 0);
+                    if (aValue->Type() == nsAttrValue::eColor) {
+                        aValue->GetColorValue(color);
+                    } else {
+                        nsAutoString tmp;
+                        nsAttrValue attrValue;
+                        aValue->ToString(tmp);
+                        attrValue.ParseColor(tmp);
+                        attrValue.GetColorValue(color);
+                    }
+                    SetTitlebarColor(color, aName == nsGkAtoms::activetitlebarcolor);
+                }
+                else if (aName == nsGkAtoms::drawintitlebar) {
+                    SetDrawsInTitlebar(
+                        aValue->Equals(NS_LITERAL_STRING("true"), eCaseMatters));
+                }
+                else if (aName == nsGkAtoms::localedir) {
+                    // if the localedir changed on the root element, reset the document direction
+                    nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(document);
+                    if (xuldoc) {
+                        xuldoc->ResetDocumentDirection();
+                    }
+                }
+                else if (aName == nsGkAtoms::lwtheme ||
+                         aName == nsGkAtoms::lwthemetextcolor) {
+                    // if the lwtheme changed, make sure to reset the document lwtheme cache
+                    nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(document);
+                    if (xuldoc) {
+                        xuldoc->ResetDocumentLWTheme();
+                    }
+                }
+            }
+    
+            if (aName == nsGkAtoms::src && document) {
+                LoadSrc();
+            }
+        } else  {
+            if (mNodeInfo->Equals(nsGkAtoms::window)) {
+                if (aName == nsGkAtoms::hidechrome) {
+                    HideWindowChrome(false);
+                }
+                else if (aName == nsGkAtoms::chromemargin) {
+                    ResetChromeMargins();
+                }
+            }
+    
+            nsIDocument* doc = GetCurrentDoc();
+            if (doc && doc->GetRootElement() == this) {
+                if ((aName == nsGkAtoms::activetitlebarcolor ||
+                     aName == nsGkAtoms::inactivetitlebarcolor)) {
+                    // Use 0, 0, 0, 0 as the "none" color.
+                    SetTitlebarColor(NS_RGBA(0, 0, 0, 0), aName == nsGkAtoms::activetitlebarcolor);
+                }
+                else if (aName == nsGkAtoms::localedir) {
+                    // if the localedir changed on the root element, reset the document direction
+                    nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
+                    if (xuldoc) {
+                        xuldoc->ResetDocumentDirection();
+                    }
+                }
+                else if ((aName == nsGkAtoms::lwtheme ||
+                          aName == nsGkAtoms::lwthemetextcolor)) {
+                    // if the lwtheme changed, make sure to restyle appropriately
+                    nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
+                    if (xuldoc) {
+                        xuldoc->ResetDocumentLWTheme();
+                    }
+                }
+                else if (aName == nsGkAtoms::drawintitlebar) {
+                    SetDrawsInTitlebar(false);
                 }
             }
-        }
-
-        if (aName == nsGkAtoms::src && document) {
-            LoadSrc();
         }
 
         // XXX need to check if they're changing an event handler: if
@@ -973,157 +1009,6 @@ nsXULElement::ParseAttribute(PRInt32 aNamespaceID,
     return true;
 }
 
-nsresult
-nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, bool aNotify)
-{
-    // This doesn't call BeforeSetAttr/AfterSetAttr for now.
-    
-    NS_ASSERTION(nsnull != aName, "must have attribute name");
-    nsresult rv;
-
-    nsIDocument* doc = GetCurrentDoc();
-    mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, aNotify);
-
-    bool isId = false;
-    if (aName == nsGkAtoms::id && aNameSpaceID == kNameSpaceID_None) {
-      // Have to do this before clearing flag. See RemoveFromIdTable
-      RemoveFromIdTable();
-      isId = true;
-    }
-
-    PRInt32 index = mAttrsAndChildren.IndexOfAttr(aName, aNameSpaceID);
-    if (index < 0) {
-        return NS_OK;
-    }
-
-    nsAutoString oldValue;
-    GetAttr(aNameSpaceID, aName, oldValue);
-
-    if (aNotify) {
-        nsNodeUtils::AttributeWillChange(this, aNameSpaceID, aName,
-                                         nsIDOMMutationEvent::REMOVAL);
-    }
-
-    bool hasMutationListeners = aNotify &&
-        nsContentUtils::HasMutationListeners(this,
-            NS_EVENT_BITS_MUTATION_ATTRMODIFIED, this);
-
-    nsCOMPtr<nsIDOMAttr> attrNode;
-    if (hasMutationListeners) {
-        nsAutoString ns;
-        nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNameSpaceID, ns);
-        GetAttributeNodeNSInternal(ns, nsDependentAtomString(aName),
-                                   getter_AddRefs(attrNode));
-    }
-
-    nsDOMSlots *slots = GetExistingDOMSlots();
-    if (slots && slots->mAttributeMap) {
-      slots->mAttributeMap->DropAttribute(aNameSpaceID, aName);
-    }
-
-    // The id-handling code, and in the future possibly other code, need to
-    // react to unexpected attribute changes.
-    nsMutationGuard::DidMutate();
-
-    nsAttrValue ignored;
-    rv = mAttrsAndChildren.RemoveAttrAt(index, ignored);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // XXX if the RemoveAttrAt() call fails, we might end up having removed
-    // the attribute from the attribute map even though the attribute is still
-    // on the element
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=296205
-
-    // Deal with modification of magical attributes that side-effect
-    // other things.
-    // XXX Know how to remove POPUP event listeners when an attribute is unset?
-
-    if (isId) {
-        ClearHasID();
-    }
-
-    if (aNameSpaceID == kNameSpaceID_None) {
-        if (mNodeInfo->Equals(nsGkAtoms::window)) {
-            if (aName == nsGkAtoms::hidechrome) {
-                HideWindowChrome(false);
-            }
-            else if (aName == nsGkAtoms::chromemargin) {
-                ResetChromeMargins();
-            }
-        }
-
-        if (doc && doc->GetRootElement() == this) {
-            if ((aName == nsGkAtoms::activetitlebarcolor ||
-                 aName == nsGkAtoms::inactivetitlebarcolor)) {
-                // Use 0, 0, 0, 0 as the "none" color.
-                SetTitlebarColor(NS_RGBA(0, 0, 0, 0), aName == nsGkAtoms::activetitlebarcolor);
-            }
-            else if (aName == nsGkAtoms::localedir) {
-                // if the localedir changed on the root element, reset the document direction
-                nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
-                if (xuldoc) {
-                    xuldoc->ResetDocumentDirection();
-                }
-            }
-            else if ((aName == nsGkAtoms::lwtheme ||
-                      aName == nsGkAtoms::lwthemetextcolor)) {
-                // if the lwtheme changed, make sure to restyle appropriately
-                nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
-                if (xuldoc) {
-                    xuldoc->ResetDocumentLWTheme();
-                }
-            }
-            else if (aName == nsGkAtoms::drawintitlebar) {
-                SetDrawsInTitlebar(false);
-            }
-        }
-
-        // If the accesskey attribute is removed, unregister it here
-        // Also see nsXULLabelFrame, nsBoxFrame and nsTextBoxFrame's AttributeChanged
-        if (aName == nsGkAtoms::accesskey || aName == nsGkAtoms::control) {
-            UnregisterAccessKey(oldValue);
-        }
-
-        // Check to see if the OBSERVES attribute is being unset.  If so, we
-        // need to remove our broadcaster goop completely.
-        if (doc && (aName == nsGkAtoms::observes ||
-                          aName == nsGkAtoms::command)) {
-            RemoveBroadcaster(oldValue);
-        }
-    }
-
-    if (doc) {
-        nsRefPtr<nsXBLBinding> binding =
-            doc->BindingManager()->GetBinding(this);
-        if (binding)
-            binding->AttributeChanged(aName, aNameSpaceID, true, aNotify);
-
-    }
-
-    UpdateState(aNotify);
-
-    if (aNotify) {
-        nsNodeUtils::AttributeChanged(this, aNameSpaceID, aName,
-                                      nsIDOMMutationEvent::REMOVAL);
-    }
-
-    if (hasMutationListeners) {
-        nsMutationEvent mutation(true, NS_MUTATION_ATTRMODIFIED);
-
-        mutation.mRelatedNode = attrNode;
-        mutation.mAttrName = aName;
-
-        if (!oldValue.IsEmpty())
-          mutation.mPrevAttrValue = do_GetAtom(oldValue);
-        mutation.mAttrChange = nsIDOMMutationEvent::REMOVAL;
-
-        mozAutoSubtreeModified subtree(OwnerDoc(), this);
-        (new nsAsyncDOMEvent(this, mutation))->RunDOMEventWhenSafe();
-    }
-
-    return NS_OK;
-}
-
 void
 nsXULElement::RemoveBroadcaster(const nsAString & broadcasterId)
 {
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index d0ff262b08c..012e76c068e 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -408,8 +408,6 @@ public:
                                 bool aCompileEventHandlers);
     virtual void UnbindFromTree(bool aDeep, bool aNullParent);
     virtual void RemoveChildAt(PRUint32 aIndex, bool aNotify);
-    virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
-                               bool aNotify);
     virtual void DestroyContent();
 
 #ifdef DEBUG

From 490183954208562c002e89576e50fab180b4e4fa Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 19 Jul 2012 12:18:01 +0300
Subject: [PATCH 117/118] Bug 773945, remove nsXULElement::mPrototype, part 5,
 r=bz

---
 content/xul/content/src/nsXULElement.cpp | 19 +------
 content/xul/content/src/nsXULElement.h   | 64 +++---------------------
 2 files changed, 8 insertions(+), 75 deletions(-)

diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 53154210c3f..ea8f178eec4 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -113,7 +113,6 @@ static NS_DEFINE_CID(kXULPopupListenerCID,        NS_XULPOPUPLISTENER_CID);
 #ifdef XUL_PROTOTYPE_ATTRIBUTE_METERING
 PRUint32             nsXULPrototypeAttribute::gNumElements;
 PRUint32             nsXULPrototypeAttribute::gNumAttributes;
-PRUint32             nsXULPrototypeAttribute::gNumEventHandlers;
 PRUint32             nsXULPrototypeAttribute::gNumCacheTests;
 PRUint32             nsXULPrototypeAttribute::gNumCacheHits;
 PRUint32             nsXULPrototypeAttribute::gNumCacheSets;
@@ -1854,19 +1853,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULPrototypeNode)
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsXULPrototypeNode)
-    if (tmp->mType == nsXULPrototypeNode::eType_Element) {
-        nsXULPrototypeElement *elem =
-            static_cast<nsXULPrototypeElement*>(tmp);
-        if (elem->mHoldsScriptObject) {
-            PRUint32 i;
-            for (i = 0; i < elem->mNumAttributes; ++i) {
-                JSObject* handler = elem->mAttributes[i].mEventHandler;
-                NS_IMPL_CYCLE_COLLECTION_TRACE_JS_CALLBACK(handler,
-                                                           "mAttributes[i].mEventHandler")
-            }
-        }
-    }
-    else if (tmp->mType == nsXULPrototypeNode::eType_Script) {
+    if (tmp->mType == nsXULPrototypeNode::eType_Script) {
         nsXULPrototypeScript *script =
             static_cast<nsXULPrototypeScript*>(tmp);
         NS_IMPL_CYCLE_COLLECTION_TRACE_JS_CALLBACK(script->mScriptObject.mObject,
@@ -2162,10 +2149,6 @@ nsXULPrototypeElement::SetAttrAt(PRUint32 aPos, const nsAString& aValue,
 void
 nsXULPrototypeElement::Unlink()
 {
-    if (mHoldsScriptObject) {
-        nsContentUtils::DropJSObjects(this);
-        mHoldsScriptObject = false;
-    }
     mNumAttributes = 0;
     delete[] mAttributes;
     mAttributes = nsnull;
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index 012e76c068e..f14ec72153d 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -73,8 +73,7 @@ class nsXULPrototypeAttribute
 {
 public:
     nsXULPrototypeAttribute()
-        : mName(nsGkAtoms::id),  // XXX this is a hack, but names have to have a value
-          mEventHandler(nsnull)
+        : mName(nsGkAtoms::id)  // XXX this is a hack, but names have to have a value
     {
         XUL_PROTOTYPE_ATTRIBUTE_METER(gNumAttributes);
         MOZ_COUNT_CTOR(nsXULPrototypeAttribute);
@@ -84,53 +83,10 @@ public:
 
     nsAttrName mName;
     nsAttrValue mValue;
-    // mEventHandler is only valid for the language ID specified in the
-    // containing nsXULPrototypeElement.  We would ideally use
-    // nsScriptObjectHolder, but want to avoid the extra lang ID.
-    JSObject* mEventHandler;
 
 #ifdef XUL_PROTOTYPE_ATTRIBUTE_METERING
-    /**
-      If enough attributes, on average, are event handlers, it pays to keep
-      mEventHandler here, instead of maintaining a separate mapping in each
-      nsXULElement associating those mName values with their mEventHandlers.
-      Assume we don't need to keep mNameSpaceID along with mName in such an
-      event-handler-only name-to-function-pointer mapping.
-
-      Let
-        minAttrSize  = sizeof(mNodeInof) + sizeof(mValue)
-        mappingSize  = sizeof(mNodeInfo) + sizeof(mEventHandler)
-        elemOverhead = nElems * sizeof(MappingPtr)
-
-      Then
-        nAttrs * minAttrSize + nEventHandlers * mappingSize + elemOverhead
-        > nAttrs * (minAttrSize + mappingSize - sizeof(mNodeInfo))
-      which simplifies to
-        nEventHandlers * mappingSize + elemOverhead
-        > nAttrs * (mappingSize - sizeof(mNodeInfo))
-      or
-        nEventHandlers + (nElems * sizeof(MappingPtr)) / mappingSize
-        > nAttrs * (1 - sizeof(mNodeInfo) / mappingSize)
-
-      If nsCOMPtr and all other pointers are the same size, this reduces to
-        nEventHandlers + nElems / 2 > nAttrs / 2
-
-      To measure how many attributes are event handlers, compile XUL source
-      with XUL_PROTOTYPE_ATTRIBUTE_METERING and watch the counters below.
-      Plug into the above relation -- if true, it pays to put mEventHandler
-      in nsXULPrototypeAttribute rather than to keep a separate mapping.
-
-      Recent numbers after opening four browser windows:
-        nElems 3537, nAttrs 2528, nEventHandlers 1042
-      giving 1042 + 3537/2 > 2528/2 or 2810 > 1264.
-
-      As it happens, mEventHandler also makes this struct power-of-2 sized,
-      8 words on most architectures, which makes for strength-reduced array
-      index-to-pointer calculations.
-     */
     static PRUint32   gNumElements;
     static PRUint32   gNumAttributes;
-    static PRUint32   gNumEventHandlers;
     static PRUint32   gNumCacheTests;
     static PRUint32   gNumCacheHits;
     static PRUint32   gNumCacheSets;
@@ -142,9 +98,7 @@ public:
 /**
 
   A prototype content model element that holds the "primordial" values
-  that have been parsed from the original XUL document. A
-  'lightweight' nsXULElement may delegate its representation to this
-  structure, which is shared.
+  that have been parsed from the original XUL document.
 
  */
 
@@ -194,11 +148,10 @@ public:
     nsXULPrototypeElement()
         : nsXULPrototypeNode(eType_Element),
           mNumAttributes(0),
-          mAttributes(nsnull),
           mHasIdAttribute(false),
           mHasClassAttribute(false),
           mHasStyleAttribute(false),
-          mHoldsScriptObject(false)
+          mAttributes(nsnull)
     {
     }
 
@@ -238,14 +191,11 @@ public:
 
     nsCOMPtr<nsINodeInfo>    mNodeInfo;           // [OWNER]
 
-    PRUint32                 mNumAttributes;
+    PRUint32                 mNumAttributes:29;
+    PRUint32                 mHasIdAttribute:1;
+    PRUint32                 mHasClassAttribute:1;
+    PRUint32                 mHasStyleAttribute:1;
     nsXULPrototypeAttribute* mAttributes;         // [OWNER]
-    
-    bool                     mHasIdAttribute:1;
-    bool                     mHasClassAttribute:1;
-    bool                     mHasStyleAttribute:1;
-    bool                     mHoldsScriptObject:1;
-
 };
 
 class nsXULDocument;

From 7a23f78fd54df3dbe6fcfb5a415e3cdbd4f46a15 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 19 Jul 2012 12:21:40 +0300
Subject: [PATCH 118/118] Bug 773945, remove nsXULElement::mPrototype, part 6,
 r=bz

---
 content/xul/content/src/nsXULElement.cpp | 43 ++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index ea8f178eec4..511865f48a3 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -347,11 +347,48 @@ nsXULElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
 
     // Note that we're _not_ copying mControllers.
 
-    nsresult rv = const_cast<nsXULElement*>(this)->CopyInnerTo(element);
-    if (NS_SUCCEEDED(rv)) {
-        element.forget(aResult);
+    PRUint32 count = mAttrsAndChildren.AttrCount();
+    nsresult rv = NS_OK;
+    for (PRUint32 i = 0; i < count; ++i) {
+        const nsAttrName* originalName = mAttrsAndChildren.AttrNameAt(i);
+        const nsAttrValue* originalValue = mAttrsAndChildren.AttrAt(i);
+        nsAttrValue attrValue;
+
+        // Style rules need to be cloned.
+        if (originalValue->Type() == nsAttrValue::eCSSStyleRule) {
+            nsRefPtr<css::Rule> ruleClone =
+                originalValue->GetCSSStyleRuleValue()->Clone();
+
+            nsString stringValue;
+            originalValue->ToString(stringValue);
+
+            nsRefPtr<css::StyleRule> styleRule = do_QueryObject(ruleClone);
+            attrValue.SetTo(styleRule, &stringValue);
+        } else {
+            attrValue.SetTo(*originalValue);
+        }
+
+        if (originalName->IsAtom()) {
+           rv = element->mAttrsAndChildren.SetAndTakeAttr(originalName->Atom(),
+                                                          attrValue);
+        } else {
+            rv = element->mAttrsAndChildren.SetAndTakeAttr(originalName->NodeInfo(),
+                                                           attrValue);
+        }
+        NS_ENSURE_SUCCESS(rv, rv);
+        element->AddListenerFor(*originalName, true);
+        if (originalName->Equals(nsGkAtoms::id)) {
+            element->SetHasID();
+        }
+        if (originalName->Equals(nsGkAtoms::_class)) {
+            element->SetFlags(NODE_MAY_HAVE_CLASS);
+        }
+        if (originalName->Equals(nsGkAtoms::style)) {
+            element->SetMayHaveStyle();
+        }
     }
 
+    element.forget(aResult);
     return rv;
 }