From bb8609bee72b07529ed5b1ef59da3ac21b2c2659 Mon Sep 17 00:00:00 2001
From: Cykesiopka <cykesiopka@hotmail.com>
Date: Mon, 25 Feb 2013 09:07:15 -0500
Subject: [PATCH 01/64] Bug 326317 - Fix issues with comments in
 nsTSubstring.h. r=dbaron

---
 xpcom/string/public/nsTSubstring.h | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/xpcom/string/public/nsTSubstring.h b/xpcom/string/public/nsTSubstring.h
index e63388a6bca..28ca1fa5af9 100644
--- a/xpcom/string/public/nsTSubstring.h
+++ b/xpcom/string/public/nsTSubstring.h
@@ -275,9 +275,10 @@ class nsTSubstring_CharT
          */
       bool NS_FASTCALL EqualsASCII( const char* data ) const;
 
-    // EqualsLiteral must ONLY be applied to an actual literal string.
-    // Do not attempt to use it with a regular char* pointer, or with a char
-    // array variable.
+    // EqualsLiteral must ONLY be applied to an actual literal string, or
+    // a char array *constant* declared without an explicit size.
+    // Do not attempt to use it with a regular char* pointer, or with a
+    // non-constant char array variable. Use EqualsASCII for them.
     // The template trick to acquire the array length at compile time without
     // using a macro is due to Corey Kosak, with much thanks.
 #ifdef NS_DISABLE_LITERAL_TEMPLATE
@@ -309,8 +310,9 @@ class nsTSubstring_CharT
       bool NS_FASTCALL LowerCaseEqualsASCII( const char* data ) const;
 
     // LowerCaseEqualsLiteral must ONLY be applied to an actual
-    // literal string.  Do not attempt to use it with a regular char*
-    // pointer, or with a char array variable. Use
+    // literal string, or a char array *constant* declared without an 
+    // explicit size.  Do not attempt to use it with a regular char*
+    // pointer, or with a non-constant char array variable. Use
     // LowerCaseEqualsASCII for them.
 #ifdef NS_DISABLE_LITERAL_TEMPLATE
       inline bool LowerCaseEqualsLiteral( const char* str ) const
@@ -360,9 +362,10 @@ class nsTSubstring_CharT
           return AssignASCII(data, strlen(data), fallible_t());
         }
 
-    // AssignLiteral must ONLY be applied to an actual literal string.
-    // Do not attempt to use it with a regular char* pointer, or with a char
-    // array variable. Use AssignASCII for those.
+    // AssignLiteral must ONLY be applied to an actual literal string, or
+    // a char array *constant* declared without an explicit size.
+    // Do not attempt to use it with a regular char* pointer, or with a 
+    // non-constant char array variable. Use AssignASCII for those.
     // There are not fallible version of these methods because they only really
     // apply to small allocations that we wouldn't want to check anyway.
 #ifdef NS_DISABLE_LITERAL_TEMPLATE
@@ -482,8 +485,11 @@ class nsTSubstring_CharT
          */
 
         /**
-         * Attempts to set the capacity to the given size, without affecting
-         * the length of the string. Also ensures that the buffer is mutable.
+         * Attempts to set the capacity to the given size in number of 
+         * characters, without affecting the length of the string.
+         * There is no need to include room for the null terminator: it is
+         * the job of the string class.
+         * Also ensures that the buffer is mutable.
          */
       void NS_FASTCALL SetCapacity( size_type newCapacity );
       bool NS_FASTCALL SetCapacity( size_type newCapacity, const fallible_t& ) NS_WARN_UNUSED_RESULT;

From a034506aa9f4996cd14f6ccaa359c971ab2c9cc9 Mon Sep 17 00:00:00 2001
From: Andrew Quartey <andrew.quartey@gmail.com>
Date: Mon, 25 Feb 2013 09:07:16 -0500
Subject: [PATCH 02/64] Bug 715767 - Make LayerManagerD3D10::ReportFailure
 threadsafe. r=joe

---
 widget/xpwidgets/GfxInfoBase.cpp | 11 +++++++----
 widget/xpwidgets/GfxInfoBase.h   |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/widget/xpwidgets/GfxInfoBase.cpp b/widget/xpwidgets/GfxInfoBase.cpp
index 5164e65c933..11090cd6baf 100644
--- a/widget/xpwidgets/GfxInfoBase.cpp
+++ b/widget/xpwidgets/GfxInfoBase.cpp
@@ -33,6 +33,7 @@
 
 using namespace mozilla::widget;
 using namespace mozilla;
+using mozilla::MutexAutoLock;
 
 nsTArray<GfxDriverInfo>* GfxInfoBase::mDriverInfo;
 bool GfxInfoBase::mDriverInfoObserverInitialized;
@@ -86,7 +87,7 @@ void InitGfxDriverInfoShutdownObserver()
 using namespace mozilla::widget;
 using namespace mozilla;
 
-NS_IMPL_ISUPPORTS3(GfxInfoBase, nsIGfxInfo, nsIObserver, nsISupportsWeakReference)
+NS_IMPL_THREADSAFE_ISUPPORTS3(GfxInfoBase, nsIGfxInfo, nsIObserver, nsISupportsWeakReference)
 
 #define BLACKLIST_PREF_BRANCH "gfx.blacklist."
 #define SUGGESTED_VERSION_PREF BLACKLIST_PREF_BRANCH "suggested-driver-version"
@@ -531,6 +532,7 @@ GfxInfoBase::Observe(nsISupports* aSubject, const char* aTopic,
 
 GfxInfoBase::GfxInfoBase()
     : mFailureCount(0)
+    , mMutex("GfxInfoBase")
 {
 }
 
@@ -838,14 +840,15 @@ GfxInfoBase::EvaluateDownloadedBlacklist(nsTArray<GfxDriverInfo>& aDriverInfo)
 NS_IMETHODIMP_(void)
 GfxInfoBase::LogFailure(const nsACString &failure)
 {
+  MutexAutoLock lock(mMutex);
   /* We only keep the first 9 failures */
   if (mFailureCount < ArrayLength(mFailures)) {
     mFailures[mFailureCount++] = failure;
 
     /* record it in the crash notes too */
-#if defined(MOZ_CRASHREPORTER)
-    CrashReporter::AppendAppNotesToCrashReport(failure);
-#endif
+    #if defined(MOZ_CRASHREPORTER)
+      CrashReporter::AppendAppNotesToCrashReport(failure);
+    #endif
   }
 
 }
diff --git a/widget/xpwidgets/GfxInfoBase.h b/widget/xpwidgets/GfxInfoBase.h
index 6f343caf051..bb86f74cadb 100644
--- a/widget/xpwidgets/GfxInfoBase.h
+++ b/widget/xpwidgets/GfxInfoBase.h
@@ -17,6 +17,7 @@
 #include "nsString.h"
 #include "GfxInfoCollector.h"
 #include "nsIGfxInfoDebug.h"
+#include "mozilla/Mutex.h"
 
 namespace mozilla {
 namespace widget {  
@@ -95,6 +96,7 @@ private:
 
   nsCString mFailures[9]; // The choice of 9 is Ehsan's
   uint32_t mFailureCount;
+  Mutex mMutex;
 
 };
 

From ebfb1bde3d0075a2087995f60d59d636124dcd86 Mon Sep 17 00:00:00 2001
From: Mohit Gahlot <mohit.www@gmail.com>
Date: Mon, 28 Jan 2013 00:00:25 +0530
Subject: [PATCH 03/64] Bug 823939 - <mmultiscripts> now doesnt consider base
 followed by only <mprescripts> and no (presubscript presuperscript) pair as
 invalid-markup. r=fredw, r=Pike

---
 .../en-US/chrome/mathml/mathml.properties      |  3 ++-
 layout/mathml/nsMathMLmmultiscriptsFrame.cpp   |  6 +++---
 layout/mathml/tests/test_bug553917.html        |  2 +-
 .../mathml/mathml-mmultiscript-base-ref.html   | 14 ++++++++++++++
 .../mathml/mathml-mmultiscript-base.html       | 16 ++++++++++++++++
 .../mathml-mmultiscript-mprescript-ref.html    | 15 +++++++++++++++
 .../mathml/mathml-mmultiscript-mprescript.html | 18 ++++++++++++++++++
 layout/reftests/mathml/reftest.list            |  2 ++
 8 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 layout/reftests/mathml/mathml-mmultiscript-base-ref.html
 create mode 100644 layout/reftests/mathml/mathml-mmultiscript-base.html
 create mode 100644 layout/reftests/mathml/mathml-mmultiscript-mprescript-ref.html
 create mode 100644 layout/reftests/mathml/mathml-mmultiscript-mprescript.html

diff --git a/dom/locales/en-US/chrome/mathml/mathml.properties b/dom/locales/en-US/chrome/mathml/mathml.properties
index f46d8e2d2a5..c4f7e4e9d8f 100644
--- a/dom/locales/en-US/chrome/mathml/mathml.properties
+++ b/dom/locales/en-US/chrome/mathml/mathml.properties
@@ -4,7 +4,8 @@
 
 ChildCountIncorrect=Invalid markup: Incorrect number of children for <%1$S/> tag.
 DuplicateMprescripts=Invalid markup: More than one <mprescripts/> in <mmultiscripts/>.
-NoSubSup=Invalid markup: Expected at least one subscript/superscript pair in <mmultiscripts/>.  Found none.
+# LOCALIZATION NOTE:  The first child of <mmultiscript/> is the base, that is the element to which scripts are attached.
+NoBase=Invalid markup: Expected exactly one Base element in <mmultiscripts/>.  Found none.
 SubSupMismatch=Invalid markup: Incomplete subscript/superscript pair in <mmultiscripts/>.
 
 # LOCALIZATION NOTE:  When localizing the single quotes ('), follow the conventions in css.properties for your target locale.
diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
index a528242f8a3..13b70032f89 100644
--- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
+++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
@@ -359,11 +359,11 @@ nsMathMLmmultiscriptsFrame::Place(nsRenderingContext& aRenderingContext,
     childFrame = childFrame->GetNextSibling();
   }
   // note: width=0 if all sup-sub pairs match correctly
-  if ((0 != width) || !baseFrame || !subScriptFrame || !supScriptFrame) {
+  if ((0 != width) || !baseFrame) {
     // report an error, encourage people to get their markups in order
     if (aPlaceOrigin) {
-      if (count <= 1 || (count == 2 && mprescriptsFrame)) {
-        ReportErrorToConsole("NoSubSup");
+      if (!baseFrame) {
+        ReportErrorToConsole("NoBase");
       } else {
         ReportErrorToConsole("SubSupMismatch");
       }
diff --git a/layout/mathml/tests/test_bug553917.html b/layout/mathml/tests/test_bug553917.html
index 97df26f36ad..20e5dd97182 100644
--- a/layout/mathml/tests/test_bug553917.html
+++ b/layout/mathml/tests/test_bug553917.html
@@ -62,7 +62,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=553917
         <math><mmultiscripts><mi>x</mi><mi>y</mi></mmultiscripts></math>*/
         MMultiscriptsErrors: {
           status: [false, false, false],
-          args: ["DuplicateMprescripts", "NoSubSup", "SubSupMismatch"]
+          args: ["NoBase","DuplicateMprescripts", "SubSupMismatch"]
         },
       /*<math><mo minsize="2">+</mo></math>*/
         UnitlessValuesAreDeprecated : {
diff --git a/layout/reftests/mathml/mathml-mmultiscript-base-ref.html b/layout/reftests/mathml/mathml-mmultiscript-base-ref.html
new file mode 100644
index 00000000000..45f43e9f9bb
--- /dev/null
+++ b/layout/reftests/mathml/mathml-mmultiscript-base-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>mmultiscript with only base</title>
+	</head>
+	
+	<body>
+		<math>
+			<mmultiscripts>
+			<mtext>base</mtext>
+			</mmultiscripts>
+		</math>
+	</body>
+</html>
diff --git a/layout/reftests/mathml/mathml-mmultiscript-base.html b/layout/reftests/mathml/mathml-mmultiscript-base.html
new file mode 100644
index 00000000000..f2832df4795
--- /dev/null
+++ b/layout/reftests/mathml/mathml-mmultiscript-base.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>mmultiscript with only base and none as placeholder</title>
+	</head>
+
+	<body>
+		<math> 
+			<mmultiscripts>
+				<mtext>base</mtext>
+				<none/>
+				<none/>
+			</mmultiscripts>
+		</math>
+	</body>
+</html>
diff --git a/layout/reftests/mathml/mathml-mmultiscript-mprescript-ref.html b/layout/reftests/mathml/mathml-mmultiscript-mprescript-ref.html
new file mode 100644
index 00000000000..b30e7fb9762
--- /dev/null
+++ b/layout/reftests/mathml/mathml-mmultiscript-mprescript-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>mmultiscript with mprescripts without none</title>
+	</head>
+
+	<body>
+		<math> 
+			<mmultiscripts>
+				<mtext>base</mtext>
+				<mprescripts/>
+			</mmultiscripts>
+		</math>
+	</body>
+</html>
diff --git a/layout/reftests/mathml/mathml-mmultiscript-mprescript.html b/layout/reftests/mathml/mathml-mmultiscript-mprescript.html
new file mode 100644
index 00000000000..5bc0b5a5ad5
--- /dev/null
+++ b/layout/reftests/mathml/mathml-mmultiscript-mprescript.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>mmultiscript with mprescripts with none as placeholders</title>
+	</head>
+	
+	<body>
+		<math>
+			<mmultiscripts>
+				<mtext>base</mtext>
+				<none/>
+				<none/>
+				<mprescripts/>
+			</mmultiscripts>
+
+		</math>
+	</body>
+</html>
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index b4945594c9c..f3a6c557438 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -116,3 +116,5 @@ fails == whitespace-trim-4.html whitespace-trim-4-ref.html # Bug 787215
 == operator-1.xhtml operator-1-ref.xhtml
 == scriptshift-1.xhtml scriptshift-1-ref.xhtml
 == number-size-1.xhtml number-size-1-ref.xhtml
+== mathml-mmultiscript-base.html mathml-mmultiscript-base-ref.html
+== mathml-mmultiscript-mprescript.html mathml-mmultiscript-mprescript-ref.html

From e7c2255848b05c92419ab90da1e228126a33d76d Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Mon, 25 Feb 2013 09:07:16 -0500
Subject: [PATCH 04/64] Bug 828223 - Write nsSearchService cache with OS.File +
 nsSearchService cache tests. r=gavin

---
 toolkit/components/search/nsSearchService.js  |  29 ++---
 .../search/tests/xpcshell/head_search.js      |  30 ++++++
 .../search/tests/xpcshell/test_nocache.js     | 100 ++++++++++++++++++
 .../search/tests/xpcshell/xpcshell.ini        |   1 +
 4 files changed, 141 insertions(+), 19 deletions(-)
 create mode 100644 toolkit/components/search/tests/xpcshell/test_nocache.js

diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index 2d31f517fa5..1a7b49bf47f 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -2664,29 +2664,20 @@ SearchService.prototype = {
       cache.directories[cacheKey].engines.push(engine._serializeToJSON(true));
     }
 
-    let ostream = Cc["@mozilla.org/network/file-output-stream;1"].
-                  createInstance(Ci.nsIFileOutputStream);
-    let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
-                    createInstance(Ci.nsIScriptableUnicodeConverter);
-    let cacheFile = getDir(NS_APP_USER_PROFILE_50_DIR);
-    cacheFile.append("search.json");
-
     try {
       LOG("_buildCache: Writing to cache file.");
-      ostream.init(cacheFile, (MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE), PERMS_FILE, ostream.DEFER_OPEN);
-      converter.charset = "UTF-8";
-      let data = converter.convertToInputStream(JSON.stringify(cache));
+      let path = OS.Path.join(OS.Constants.Path.profileDir, "search.json");
+      let data = gEncoder.encode(JSON.stringify(cache));
+      let promise = OS.File.writeAtomic(path, data, { tmpPath: path + ".tmp"});
 
-      // Write to the cache file asynchronously
-      NetUtil.asyncCopy(data, ostream, function(rv) {
-        if (Components.isSuccessCode(rv)) {
-          Services.obs.notifyObservers(null,
-                                       SEARCH_SERVICE_TOPIC,
-                                       SEARCH_SERVICE_CACHE_WRITTEN);
-        } else {
-          LOG("_buildCache: failure during asyncCopy: " + rv);
+      promise.then(
+        function onSuccess() {
+          Services.obs.notifyObservers(null, SEARCH_SERVICE_TOPIC, SEARCH_SERVICE_CACHE_WRITTEN);
+        },
+        function onError(e) {
+          LOG("_buildCache: failure during writeAtomic: " + e);
         }
-      });
+      );
     } catch (ex) {
       LOG("_buildCache: Could not write to cache file: " + ex);
     }
diff --git a/toolkit/components/search/tests/xpcshell/head_search.js b/toolkit/components/search/tests/xpcshell/head_search.js
index cb6b397146d..4775ae4a017 100644
--- a/toolkit/components/search/tests/xpcshell/head_search.js
+++ b/toolkit/components/search/tests/xpcshell/head_search.js
@@ -51,6 +51,19 @@ function removeCacheFile()
   }
 }
 
+/**
+ * Clean the profile of any cache file left from a previous run.
+ */
+function removeCache()
+{
+  let file = gProfD.clone();
+  file.append("search.json");
+  if (file.exists()) {
+    file.remove(false);
+  }
+
+}
+
 /**
  * Run some callback once metadata has been committed to disk.
  */
@@ -67,6 +80,23 @@ function afterCommit(callback)
   Services.obs.addObserver(obs, "browser-search-service", false);
 }
 
+/**
+ * Run some callback once cache has been built.
+ */
+function afterCache(callback)
+{
+  let obs = function(result, topic, verb) {
+    do_print("afterCache: " + verb);
+    if (verb == "write-cache-to-disk-complete") {
+      Services.obs.removeObserver(obs, topic);
+      callback(result);
+    } else {
+      dump("TOPIC: " + topic+ "\n");
+    }
+  }
+  Services.obs.addObserver(obs, "browser-search-service", false);
+}
+
 function  parseJsonFromStream(aInputStream) {
   const json = Cc["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON);
   const data = json.decodeFromStream(aInputStream, aInputStream.available());
diff --git a/toolkit/components/search/tests/xpcshell/test_nocache.js b/toolkit/components/search/tests/xpcshell/test_nocache.js
new file mode 100644
index 00000000000..600a2229d55
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/test_nocache.js
@@ -0,0 +1,100 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let Cu = Components.utils;
+let Ci = Components.interfaces;
+
+Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://testing-common/httpd.js");
+
+/*
+ * test_nocache: Start search engine
+ * - without search.json
+ *
+ * Ensure that :
+ * - nothing explodes;
+ * - search.json is created.
+ */
+
+
+function run_test()
+{
+  removeCache();
+  updateAppInfo();
+  do_load_manifest("data/chrome.manifest");
+
+  let httpServer = new HttpServer();
+  httpServer.start(4444);
+  httpServer.registerDirectory("/", do_get_cwd());
+
+  let search = Services.search;
+
+  do_test_pending();
+
+  // Check that cache is created at startup
+  afterCache(function cacheCreated() {
+    // Check that search.json has been created.
+    let cache = gProfD.clone();
+    cache.append("search.json");
+    do_check_true(cache.exists());
+  });
+
+  // Perform initialization
+  search.init(function ss_initialized(rv) {
+    do_check_true(Components.isSuccessCode(rv));
+
+    do_print("Setting up observer");
+    function observer(aSubject, aTopic, aData) {
+      do_print("Observing topic " + aTopic);
+      if ("engine-added" == aData) {
+        let engine = search.getEngineByName("Test search engine");
+        if (!engine) {
+          return;
+        }
+        Services.obs.removeObserver(observer, "browser-search-engine-modified");
+        do_print("Engine has been added, let's wait for the cache to be built");
+        afterCache(function() {
+          do_print("Success");
+
+          Task.spawn(function task() {
+            do_print("Searching test engine in cache");
+            try {
+              let path = OS.Path.join(OS.Constants.Path.profileDir, "search.json");
+              let data = yield OS.File.read(path);
+              let text = new TextDecoder().decode(data);
+              let cache = JSON.parse(text);
+              let found = false;
+              for (let dirName in cache.directories) {
+                for (let engine of cache.directories[dirName].engines) {
+                  if (engine._id == "[app]/test-search-engine.xml") {
+                    found = true;
+                    break;
+                  }
+                }
+                if (found) {
+                  break;
+                }
+              }
+              do_check_true(found);
+            } catch (ex) {
+              do_throw(ex);
+            } finally {
+              removeCache();
+              httpServer.stop(function() {
+                // httpServer doesn't seem to stop cleanly if there is no callback
+              });
+              do_test_finished();
+            }
+          });
+        });
+      }
+    };
+    Services.obs.addObserver(observer, "browser-search-engine-modified", false);
+
+    // Add an engine, check if it appears in the cache
+    search.addEngine("http://localhost:4444/data/engine.xml",
+                   Ci.nsISearchEngine.DATA_XML,
+                   null, false);
+  });
+}
diff --git a/toolkit/components/search/tests/xpcshell/xpcshell.ini b/toolkit/components/search/tests/xpcshell/xpcshell.ini
index f46bd6b92e1..daaa4774470 100644
--- a/toolkit/components/search/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini
@@ -3,6 +3,7 @@ head = head_search.js
 tail = 
 firefox-appdir = browser
 
+[test_nocache.js]
 [test_645970.js]
 [test_init_async_multiple.js]
 [test_init_async_multiple_then_sync.js]

From a266fca5cdd8880c3a4945492b820bf0f157186a Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Mon, 25 Feb 2013 09:07:16 -0500
Subject: [PATCH 05/64] Bug 840436 - OS.File.writeAtomic without flush doesn't
 rename anymore. r=froydnj

---
 .../components/osfile/osfile_shared_front.jsm | 45 +++++++++-------
 .../tests/mochi/main_test_osfile_async.js     | 54 +++++++++++++++++++
 2 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/toolkit/components/osfile/osfile_shared_front.jsm b/toolkit/components/osfile/osfile_shared_front.jsm
index a3f5d70cd9a..b7e01202f2d 100644
--- a/toolkit/components/osfile/osfile_shared_front.jsm
+++ b/toolkit/components/osfile/osfile_shared_front.jsm
@@ -308,17 +308,15 @@ AbstractFile.read = function read(path, bytes) {
 };
 
 /**
- * Write a file, atomically.
+ * Write a file in one operation.
  *
- * By opposition to a regular |write|, this operation ensures that,
- * until the contents are fully written, the destination file is
- * not modified.
- *
- * By default, files are flushed for additional safety, i.e. to lower
- * the risks of losing data in case the device is suddenly removed or
- * in case of sudden shutdown. This additional safety is important
- * for user-critical data (e.g. preferences, application data, etc.)
- * but comes at a performance cost. For non-critical data (e.g. cache,
+ * By default, this operation ensures that, until the contents are
+ * fully written, the destination file is not modified. By default,
+ * files are flushed for additional safety, i.e. to lower the risks of
+ * losing data in case the device is suddenly removed or in case of
+ * sudden shutdown. This additional safety is important for
+ * user-critical data (e.g. preferences, application data, etc.) but
+ * comes at a performance cost. For non-critical data (e.g. cache,
  * thumbnails, etc.), you may wish to deactivate flushing by passing
  * option |flush: false|.
  *
@@ -347,23 +345,34 @@ AbstractFile.writeAtomic =
      function writeAtomic(path, buffer, options) {
   options = options || noOptions;
 
-  let tmpPath = options.tmpPath;
-  if (!tmpPath) {
-    throw new TypeError("Expected option tmpPath");
-  }
-
   let noOverwrite = options.noOverwrite;
   if (noOverwrite && OS.File.exists(path)) {
     throw OS.File.Error.exists("writeAtomic");
   }
 
+  if ("flush" in options && !options.flush) {
+    // Just write, without any renaming trick
+    let dest;
+    try {
+      dest = OS.File.open(path, {write: true, truncate: true});
+      return dest.write(buffer, options);
+    } finally {
+      dest.close();
+    }
+  }
+
+
+  let tmpPath = options.tmpPath;
+  if (!tmpPath) {
+    throw new TypeError("Expected option tmpPath");
+  }
+
+
   let tmpFile = OS.File.open(tmpPath, {write: true, truncate: true});
   let bytesWritten;
   try {
     bytesWritten = tmpFile.write(buffer, options);
-    if ("flush" in options && options.flush) {
-      tmpFile.flush();
-    }
+    tmpFile.flush();
   } catch (x) {
     OS.File.remove(tmpPath);
     throw x;
diff --git a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
index d4386f5d54f..7193c643abd 100644
--- a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
+++ b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
@@ -402,6 +402,60 @@ let test_read_write_all = maketest("read_write_all", function read_write_all(tes
 
     // Cleanup.
     OS.File.remove(pathDest);
+
+    // Same tests with |flush: false|
+    // Check that read + writeAtomic performs a correct copy
+    options = {tmpPath: tmpPath, flush: false};
+    optionsBackup = {tmpPath: tmpPath, flush: false};
+    bytesWritten = yield OS.File.writeAtomic(pathDest, contents, options);
+    test.is(contents.byteLength, bytesWritten, "Wrote the correct number of bytes (without flush)");
+
+    // Check that options are not altered
+    test.is(Object.keys(options).length, Object.keys(optionsBackup).length,
+            "The number of options was not changed (without flush)");
+    for (let k in options) {
+      test.is(options[k], optionsBackup[k], "Option was not changed (without flush)");
+    }
+    yield reference_compare_files(pathSource, pathDest, test);
+
+    // Check that temporary file was removed
+    test.info("Compare complete (without flush)");
+    test.ok(!(new FileUtils.File(tmpPath).exists()), "Temporary file was removed (without flush)");
+
+    // Check that writeAtomic fails if noOverwrite is true and the destination
+    // file already exists!
+    view = new Uint8Array(contents.buffer, 10, 200);
+    try {
+      options = {tmpPath: tmpPath, noOverwrite: true, flush: false};
+      yield OS.File.writeAtomic(pathDest, view, options);
+      test.fail("With noOverwrite, writeAtomic should have refused to overwrite file (without flush)");
+    } catch (err) {
+      test.info("With noOverwrite, writeAtomic correctly failed (without flush)");
+      test.ok(err instanceof OS.File.Error, "writeAtomic correctly failed with a file error (without flush)");
+      test.ok(err.becauseExists, "writeAtomic file error confirmed that the file already exists (without flush)");
+    }
+    yield reference_compare_files(pathSource, pathDest, test);
+    test.ok(!(new FileUtils.File(tmpPath).exists()), "Temporary file was removed (without flush)");
+
+    // Now write a subset
+    START = 10;
+    LENGTH = 100;
+    view = new Uint8Array(contents.buffer, START, LENGTH);
+    bytesWritten = yield OS.File.writeAtomic(pathDest, view, {tmpPath: tmpPath, flush: false});
+    test.is(bytesWritten, LENGTH, "Partial write wrote the correct number of bytes (without flush)");
+    array2 = yield OS.File.read(pathDest);
+    view1 = new Uint8Array(contents.buffer, START, LENGTH);
+    test.is(view1.length, array2.length, "Re-read partial write with the correct number of bytes (without flush)");
+    for (let i = 0; i < LENGTH; ++i) {
+      if (view1[i] != array2[i]) {
+        test.is(view1[i], array2[i], "Offset " + i + " is correct (without flush)");
+      }
+      test.ok(true, "Compared re-read of partial write (without flush)");
+    }
+
+    // Cleanup.
+    OS.File.remove(pathDest);
+
   });
 });
 

From 9705cc157e8f03c595688bcec6fdeb4e1a316f9c Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Mon, 25 Feb 2013 09:07:16 -0500
Subject: [PATCH 06/64] Bug 840834 - Fix compiler warning. r=jesup

---
 dom/media/MediaManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index dd7ca00bf08..a63a6df14dd 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -912,7 +912,7 @@ MediaManager::GetUserMedia(bool aPrivileged, nsPIDOMWindow* aWindow,
       uint32_t permission;
       nsCOMPtr<nsIDocument> doc = aWindow->GetExtantDoc();
       pm->TestPermission(doc->NodePrincipal(), &permission);
-      if ((permission == nsIPopupWindowManager::DENY_POPUP)) {
+      if (permission == nsIPopupWindowManager::DENY_POPUP) {
         nsCOMPtr<nsIDOMDocument> domDoc = aWindow->GetExtantDocument();
         nsGlobalWindow::FirePopupBlockedEvent(
           domDoc, aWindow, nullptr, EmptyString(), EmptyString()

From 5771db118a20d3509d03ac1ab74ff5e6aeee0027 Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Mon, 25 Feb 2013 09:07:17 -0500
Subject: [PATCH 07/64] Bug 843479 - More logging for
 test_init_async_multiple_then_sync.js.

---
 .../test_init_async_multiple_then_sync.js     | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/toolkit/components/search/tests/xpcshell/test_init_async_multiple_then_sync.js b/toolkit/components/search/tests/xpcshell/test_init_async_multiple_then_sync.js
index 85c427f5281..48adba74a55 100644
--- a/toolkit/components/search/tests/xpcshell/test_init_async_multiple_then_sync.js
+++ b/toolkit/components/search/tests/xpcshell/test_init_async_multiple_then_sync.js
@@ -36,26 +36,33 @@ function run_test() {
 
   // Ensure that all asynchronous initializers eventually complete
   let init_complete = function init_complete(i) {
+    do_print("init complete " + i);
     do_check_true(pending[i]);
     pending[i] = false;
     numberPending--;
     do_check_true(numberPending >= 0);
     do_check_true(Services.search.isInitialized);
-    if (numberPending == 0) {
-      // Just check that we can access a list of engines.
-      let engines = Services.search.getEngines();
-      do_check_neq(engines, null);
-
-      // Wait a little before quitting: if some initializer is
-      // triggered twice, we want to catch that error.
-      do_timeout(1000, function() {
-        do_test_finished();
-      });
+    if (numberPending != 0) {
+      do_print("Still waiting for the following initializations: " + JSON.stringify(pending));
+      return;
     }
+    do_print("All initializations have completed");
+    // Just check that we can access a list of engines.
+    let engines = Services.search.getEngines();
+    do_check_neq(engines, null);
+
+    do_print("Waiting a second before quitting");
+    // Wait a little before quitting: if some initializer is
+    // triggered twice, we want to catch that error.
+    do_timeout(1000, function() {
+      do_print("Test is complete");
+      do_test_finished();
+    });
   };
 
   // ... but don't wait for asynchronous initializations to complete
   let engines = Services.search.getEngines();
   do_check_neq(engines, null);
+  do_print("Synchronous part of the test complete");
 }
 

From 5c45942eaee964ce45d9f6bf4c0d7141183e64e3 Mon Sep 17 00:00:00 2001
From: Steve Singer <steve@ssinger.info>
Date: Mon, 25 Feb 2013 15:11:30 +0100
Subject: [PATCH 08/64] Bug 814693 Followup - fix/enable webrtc on ppc.
 r=ted,jesup

---
 configure.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 44090398124..35182a86c87 100644
--- a/configure.in
+++ b/configure.in
@@ -8971,7 +8971,7 @@ echo $MAKEFILES > unallmakefiles
 
 AC_OUTPUT($MAKEFILES)
 
-# target_arch is from {ia32|x64|arm}
+# target_arch is from {ia32|x64|arm|ppc}
 case "$CPU_ARCH" in
 x86_64 | ia64)
     WEBRTC_TARGET_ARCH=x64
@@ -8985,6 +8985,9 @@ x86)
     WEBRTC_TARGET_ARCH=ia32
     ;;
 
+ppc*)
+    WEBRTC_TARGET_ARCH=ppc
+    ;;
 *)
 # unsupported arch for webrtc
     WEBRTC_TARGET_ARCH=unknown

From efd5e3ed651c5ab7ebdd4a1e8dd0c46e21134d20 Mon Sep 17 00:00:00 2001
From: Eddy Bruel <ejpbruel@mozilla.com>
Date: Mon, 25 Feb 2013 15:16:39 +0100
Subject: [PATCH 09/64] Bug 757188 - Implement Script.getAllColumnOffsets;
 r=jorendorff

---
 .../debug/Script-getAllColumnOffsets-01.js    | 19 +++++++
 js/src/vm/Debugger.cpp                        | 54 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 js/src/jit-test/tests/debug/Script-getAllColumnOffsets-01.js

diff --git a/js/src/jit-test/tests/debug/Script-getAllColumnOffsets-01.js b/js/src/jit-test/tests/debug/Script-getAllColumnOffsets-01.js
new file mode 100644
index 00000000000..ab1cd0ec9af
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Script-getAllColumnOffsets-01.js
@@ -0,0 +1,19 @@
+// getColumnOffsets correctly places the various parts of a ForStatement.
+
+var global = newGlobal('new-compartment');
+Debugger(global).onDebuggerStatement = function (frame) {
+    var script = frame.eval("f").return.script;
+    script.getAllColumnOffsets().forEach(function (offset) {
+        script.setBreakpoint(offset.offset, {
+            hit: function (frame) {
+                assertEq(offset.lineNumber, 17);
+                global.log += offset.columnNumber + " ";
+            }
+        });
+    });
+};
+
+global.log = '';
+global.eval("function f(n) { for (var i = 0; i < n; ++i) log += '. '; log += '! '; } debugger;");
+global.f(3);
+assertEq(global.log, "21 32 44 . 39 32 44 . 39 32 44 . 39 32 57 ! 69 ");
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index e080c48595e..480bf76d8e7 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -3185,6 +3185,59 @@ DebuggerScript_getAllOffsets(JSContext *cx, unsigned argc, Value *vp)
     return true;
 }
 
+static JSBool
+DebuggerScript_getAllColumnOffsets(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_DEBUGSCRIPT_SCRIPT(cx, argc, vp, "getAllColumnOffsets", args, obj, script);
+
+    /*
+     * First pass: determine which offsets in this script are jump targets and
+     * which positions jump to them.
+     */
+    FlowGraphSummary flowData(cx);
+    if (!flowData.populate(cx, script))
+        return false;
+
+    /* Second pass: build the result array. */
+    RootedObject result(cx, NewDenseEmptyArray(cx));
+    if (!result)
+        return false;
+    for (BytecodeRangeWithPosition r(cx, script); !r.empty(); r.popFront()) {
+        size_t lineno = r.frontLineNumber();
+        size_t column = r.frontColumnNumber();
+        size_t offset = r.frontOffset();
+
+        /* Make a note, if the current instruction is an entry point for the current position. */
+        if (!flowData[offset].hasNoEdges() &&
+            (flowData[offset].lineno() != lineno ||
+             flowData[offset].column() != column)) {
+            RootedObject entry(cx, NewBuiltinClassInstance(cx, &ObjectClass));
+            if (!entry)
+                return false;
+
+            RootedId id(cx, NameToId(cx->names().lineNumber));
+            RootedValue value(cx, NumberValue(lineno));
+            if (!JSObject::defineGeneric(cx, entry, id, value))
+                return false;
+
+            value = NumberValue(column);
+            if (!JSObject::defineProperty(cx, entry, cx->names().columnNumber, value))
+                return false;
+
+            id = NameToId(cx->names().offset);
+            value = NumberValue(offset);
+            if (!JSObject::defineGeneric(cx, entry, id, value))
+                return false;
+
+            if (!js_NewbornArrayPush(cx, result, ObjectValue(*entry)))
+                return false;
+        }
+    }
+
+    args.rval().setObject(*result);
+    return true;
+}
+
 static JSBool
 DebuggerScript_getLineOffsets(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -3356,6 +3409,7 @@ static JSPropertySpec DebuggerScript_properties[] = {
 static JSFunctionSpec DebuggerScript_methods[] = {
     JS_FN("getChildScripts", DebuggerScript_getChildScripts, 0, 0),
     JS_FN("getAllOffsets", DebuggerScript_getAllOffsets, 0, 0),
+    JS_FN("getAllColumnOffsets", DebuggerScript_getAllColumnOffsets, 0, 0),
     JS_FN("getLineOffsets", DebuggerScript_getLineOffsets, 1, 0),
     JS_FN("getOffsetLine", DebuggerScript_getOffsetLine, 0, 0),
     JS_FN("setBreakpoint", DebuggerScript_setBreakpoint, 2, 0),

From e72e340ce511cf5d011271a593cfee1f6a5e51f8 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Mon, 25 Feb 2013 08:33:56 -0600
Subject: [PATCH 10/64] Bug 844270 - Move visual manifests into branding, and
 set custom background colors for each release. r=glandium

---
 browser/branding/aurora/Makefile.in              |  7 +++++++
 .../branding/aurora/VisualElementsManifest.xml   | 16 ++++++++++++++++
 browser/branding/nightly/Makefile.in             |  7 +++++++
 .../branding/nightly/VisualElementsManifest.xml  | 16 ++++++++++++++++
 browser/branding/official/Makefile.in            |  7 +++++++
 .../official/VisualElementsManifest.xml}         |  0
 browser/branding/unofficial/Makefile.in          |  7 +++++++
 .../unofficial/VisualElementsManifest.xml        | 16 ++++++++++++++++
 browser/metro/shell/Makefile.in                  |  7 -------
 9 files changed, 76 insertions(+), 7 deletions(-)
 create mode 100644 browser/branding/aurora/VisualElementsManifest.xml
 create mode 100644 browser/branding/nightly/VisualElementsManifest.xml
 rename browser/{metro/shell/VisualElementsManifest.xml.in => branding/official/VisualElementsManifest.xml} (100%)
 create mode 100644 browser/branding/unofficial/VisualElementsManifest.xml

diff --git a/browser/branding/aurora/Makefile.in b/browser/branding/aurora/Makefile.in
index e43a887fc6c..7bc0bdd4759 100644
--- a/browser/branding/aurora/Makefile.in
+++ b/browser/branding/aurora/Makefile.in
@@ -69,4 +69,11 @@ BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
+VISUALMANIFEST := VisualElementsManifest.xml
+VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
+VISUALMANIFEST_PATH := $(DIST)/bin
+PP_TARGETS += VISUALMANIFEST
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/aurora/VisualElementsManifest.xml b/browser/branding/aurora/VisualElementsManifest.xml
new file mode 100644
index 00000000000..866b61cfb82
--- /dev/null
+++ b/browser/branding/aurora/VisualElementsManifest.xml
@@ -0,0 +1,16 @@
+<Application
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <VisualElements
+      DisplayName="@MOZ_APP_DISPLAYNAME@"
+      Logo="tileresources\VisualElements_logo.png"
+      SmallLogo="tileresources\VisualElements_smalllogo.png"
+      ForegroundText="light"
+      BackgroundColor="#1c112e">
+    <DefaultTile
+        ShortName="@MOZ_APP_DISPLAYNAME@"
+        ShowName="allLogos"
+            />
+    <SplashScreen
+        Image="tileresources\VisualElements_splashscreen.png" />
+  </VisualElements>
+</Application>
diff --git a/browser/branding/nightly/Makefile.in b/browser/branding/nightly/Makefile.in
index e43a887fc6c..7bc0bdd4759 100644
--- a/browser/branding/nightly/Makefile.in
+++ b/browser/branding/nightly/Makefile.in
@@ -69,4 +69,11 @@ BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
+VISUALMANIFEST := VisualElementsManifest.xml
+VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
+VISUALMANIFEST_PATH := $(DIST)/bin
+PP_TARGETS += VISUALMANIFEST
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/nightly/VisualElementsManifest.xml b/browser/branding/nightly/VisualElementsManifest.xml
new file mode 100644
index 00000000000..5e97c80c75b
--- /dev/null
+++ b/browser/branding/nightly/VisualElementsManifest.xml
@@ -0,0 +1,16 @@
+<Application
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <VisualElements
+      DisplayName="@MOZ_APP_DISPLAYNAME@"
+      Logo="tileresources\VisualElements_logo.png"
+      SmallLogo="tileresources\VisualElements_smalllogo.png"
+      ForegroundText="light"
+      BackgroundColor="#001226">
+    <DefaultTile
+        ShortName="@MOZ_APP_DISPLAYNAME@"
+        ShowName="allLogos"
+            />
+    <SplashScreen
+        Image="tileresources\VisualElements_splashscreen.png" />
+  </VisualElements>
+</Application>
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
index e43a887fc6c..7bc0bdd4759 100644
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
@@ -69,4 +69,11 @@ BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
+VISUALMANIFEST := VisualElementsManifest.xml
+VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
+VISUALMANIFEST_PATH := $(DIST)/bin
+PP_TARGETS += VISUALMANIFEST
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/metro/shell/VisualElementsManifest.xml.in b/browser/branding/official/VisualElementsManifest.xml
similarity index 100%
rename from browser/metro/shell/VisualElementsManifest.xml.in
rename to browser/branding/official/VisualElementsManifest.xml
diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in
index e43a887fc6c..7bc0bdd4759 100644
--- a/browser/branding/unofficial/Makefile.in
+++ b/browser/branding/unofficial/Makefile.in
@@ -69,4 +69,11 @@ BRANDING_DEST := $(DIST)/branding
 BRANDING_TARGET := export
 INSTALL_TARGETS += BRANDING
 
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
+VISUALMANIFEST := VisualElementsManifest.xml
+VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
+VISUALMANIFEST_PATH := $(DIST)/bin
+PP_TARGETS += VISUALMANIFEST
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/branding/unofficial/VisualElementsManifest.xml b/browser/branding/unofficial/VisualElementsManifest.xml
new file mode 100644
index 00000000000..5e97c80c75b
--- /dev/null
+++ b/browser/branding/unofficial/VisualElementsManifest.xml
@@ -0,0 +1,16 @@
+<Application
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <VisualElements
+      DisplayName="@MOZ_APP_DISPLAYNAME@"
+      Logo="tileresources\VisualElements_logo.png"
+      SmallLogo="tileresources\VisualElements_smalllogo.png"
+      ForegroundText="light"
+      BackgroundColor="#001226">
+    <DefaultTile
+        ShortName="@MOZ_APP_DISPLAYNAME@"
+        ShowName="allLogos"
+            />
+    <SplashScreen
+        Image="tileresources\VisualElements_splashscreen.png" />
+  </VisualElements>
+</Application>
diff --git a/browser/metro/shell/Makefile.in b/browser/metro/shell/Makefile.in
index 83541fff4ac..8fc5c6684e3 100644
--- a/browser/metro/shell/Makefile.in
+++ b/browser/metro/shell/Makefile.in
@@ -19,15 +19,8 @@ endif
 
 export::
 	$(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin
-	$(RM) $(DIST)/bin/VisualElementsManifest.xml
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
-	  $(srcdir)/VisualElementsManifest.xml.in > $(DIST)/bin/VisualElementsManifest.xml
 
 install::
 	$(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin
 
-# bug 744566
-#	$(RM) $(DIST)/bin/resources.pri
-# 	$(MAKEPRI) new -v -pr $(srcdir)/tileresources -cf $(srcdir)/priconfig.xml -mn $(srcdir)/AppManifest.xml -of $(DIST)/bin/resources.pri -o
-
 include $(topsrcdir)/config/rules.mk

From fbdf0875d69b8d8c9499b34a8459e8f006a99d70 Mon Sep 17 00:00:00 2001
From: Gene Lian <clian@mozilla.com>
Date: Fri, 8 Feb 2013 18:45:04 +0800
Subject: [PATCH 11/64] Bug 839436 - B2G MMS: make DB be able to save MMS
 messages. r=vicamo

---
 .../nsIRilMobileMessageDatabaseService.idl    |  38 ++--
 .../src/ril/MobileMessageDatabaseService.js   | 174 +++++++++---------
 dom/sms/tests/test_smsdatabaseservice.xul     |  22 +--
 dom/system/gonk/RadioInterfaceLayer.js        |  92 +++++----
 4 files changed, 174 insertions(+), 152 deletions(-)

diff --git a/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl b/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
index 87169c328bf..609447ddcc4 100644
--- a/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
+++ b/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
@@ -2,30 +2,42 @@
  * 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 "domstubs.idl"
 #include "nsISupports.idl"
 #include "nsIMobileMessageDatabaseService.idl"
 
-interface nsIDOMMozSmsMessage;
-
-[scriptable, function, uuid(9cd80750-6a08-11e2-ac93-bf895e53f40e)]
+[scriptable, function, uuid(0bffae74-71db-11e2-962a-73cf64d6393e)]
 interface nsIRilMobileMessageDatabaseCallback : nsISupports
 {
-  void notify(in nsresult aRv, in nsIDOMMozSmsMessage aSms);
+  /**
+   * |aRecord| Object: the mobile-message database record
+   */
+  void notify(in nsresult aRv, in jsval aRecord);
 };
 
-[scriptable, uuid(89528354-6a08-11e2-8243-af4cf90404a9)]
+[scriptable, uuid(3592525a-71d6-11e2-82ca-f75ae6e08ee2)]
 interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
 {
-  long saveReceivedMessage(in DOMString aSender,
-                           in DOMString aBody,
-                           in DOMString aMessageClass,
-                           in unsigned long long aDate,
+  /**
+   * |aMessage| Object: should contain the following properties for internal use:
+   *   - |type| DOMString: "sms" or "mms"
+   *   - |sender| DOMString: the phone number of sender
+   *   - |timestamp| Number: the timestamp of received message
+   *   - |messageClass| DOMString: the message class of received message
+   */
+  long saveReceivedMessage(in jsval aMessage,
                 [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
-  long saveSendingMessage(in DOMString aReceiver,
-                          in DOMString aBody,
-                          in DOMString aDeliveryStatus,
-                          in unsigned long long aDate,
+
+  /**
+   * |aMessage| Object: should contain the following properties for internal use:
+   *   - |type| DOMString: "sms" or "mms"
+   *   - |receiver| DOMString: the phone number of receiver
+   *   - |timestamp| Number: the timestamp of sending message
+   *   - |deliveryStatus| DOMString: the delivery status of sending message
+   */
+  long saveSendingMessage(in jsval aMessage,
                [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
+
   void setMessageDelivery(in long aMessageId,
                           in DOMString aDelivery,
                           in DOMString aDeliveryStatus,
diff --git a/dom/mobilemessage/src/ril/MobileMessageDatabaseService.js b/dom/mobilemessage/src/ril/MobileMessageDatabaseService.js
index 4d8f02d1f43..a53765504c2 100644
--- a/dom/mobilemessage/src/ril/MobileMessageDatabaseService.js
+++ b/dom/mobilemessage/src/ril/MobileMessageDatabaseService.js
@@ -413,8 +413,8 @@ MobileMessageDatabaseService.prototype = {
     };
   },
 
-  createMessageFromRecord: function createMessageFromRecord(aRecord) {
-    if (DEBUG) debug("createMessageFromRecord: " + JSON.stringify(aRecord));
+  createSmsMessageFromRecord: function createSmsMessageFromRecord(aRecord) {
+    if (DEBUG) debug("createSmsMessageFromRecord: " + JSON.stringify(aRecord));
     return gSmsService.createSmsMessage(aRecord.id,
                                         aRecord.delivery,
                                         aRecord.deliveryStatus,
@@ -482,7 +482,7 @@ MobileMessageDatabaseService.prototype = {
     let getRequest = aObjectStore.get(firstMessageId);
     let self = this;
     getRequest.onsuccess = function onsuccess(event) {
-      let sms = self.createMessageFromRecord(event.target.result);
+      let sms = self.createSmsMessageFromRecord(event.target.result);
       if (aMessageList.listId >= 0) {
         if (DEBUG) {
           debug("notifyNextMessageInListGot - listId: "
@@ -657,8 +657,7 @@ MobileMessageDatabaseService.prototype = {
       if (!aCallback) {
         return;
       }
-      let sms = self.createMessageFromRecord(aRecord);
-      aCallback.notify(rv, sms);
+      aCallback.notify(rv, aRecord);
     }
 
     this.newTxn(READ_WRITE, function(error, txn, stores) {
@@ -678,9 +677,8 @@ MobileMessageDatabaseService.prototype = {
       // First add to main objectStore.
       stores[0].put(aRecord);
 
-      let number = getNumberFromRecord(aRecord);
-
       // Next update the other objectStore.
+      let number = getNumberFromRecord(aRecord);
       stores[1].get(number).onsuccess = function onsuccess(event) {
         let mostRecentEntry = event.target.result;
         if (mostRecentEntry) {
@@ -713,100 +711,96 @@ MobileMessageDatabaseService.prototype = {
     return aRecord.id;
   },
 
+  getRilIccInfoMsisdn: function getRilIccInfoMsisdn() {
+    let iccInfo = this.mRIL.rilContext.iccInfo;
+    let number = iccInfo ? iccInfo.msisdn : null;
+
+    // Workaround an xpconnect issue with undefined string objects.
+    // See bug 808220
+    if (number === undefined || number === "undefined") {
+      return null;
+    }
+    return number;
+  },
+
+  makePhoneNumberInternational: function makePhoneNumberInternational(aNumber) {
+    if (!aNumber) {
+      return aNumber;
+    }
+    let parsedNumber = PhoneNumberUtils.parse(aNumber.toString());
+    if (!parsedNumber || !parsedNumber.internationalNumber) {
+      return aNumber;
+    }
+    return parsedNumber.internationalNumber;
+  },
 
   /**
    * nsIRilMobileMessageDatabaseService API
    */
 
-  saveReceivedMessage: function saveReceivedMessage(
-      aSender, aBody, aMessageClass, aDate, aCallback) {
-    let iccInfo = this.mRIL.rilContext.iccInfo;
-    let receiver = iccInfo ? iccInfo.msisdn : null;
-
-    // Workaround an xpconnect issue with undefined string objects.
-    // See bug 808220
-    if (receiver === undefined || receiver === "undefined") {
-      receiver = null;
+  saveReceivedMessage: function saveReceivedMessage(aMessage, aCallback) {
+    if (aMessage.type === undefined ||
+        aMessage.sender === undefined ||
+        aMessage.messageClass === undefined ||
+        aMessage.timestamp === undefined) {
+      if (aCallback) {
+        aCallback.notify(Cr.NS_ERROR_FAILURE, null);
+      }
+      return;
     }
 
-    if (receiver) {
-      let parsedNumber = PhoneNumberUtils.parse(receiver);
-      receiver = (parsedNumber && parsedNumber.internationalNumber)
-                 ? parsedNumber.internationalNumber
-                 : receiver;
-    }
+    let receiver = this.getRilIccInfoMsisdn();
+    receiver = this.makePhoneNumberInternational(receiver);
 
-    let sender = aSender;
-    if (sender) {
-      let parsedNumber = PhoneNumberUtils.parse(sender);
-      sender = (parsedNumber && parsedNumber.internationalNumber)
-               ? parsedNumber.internationalNumber
-               : sender;
-    }
+    let sender = aMessage.sender =
+      this.makePhoneNumberInternational(aMessage.sender);
 
-    let record = {
-      deliveryIndex:  [DELIVERY_RECEIVED, aDate],
-      numberIndex:    [[sender, aDate], [receiver, aDate]],
-      readIndex:      [FILTER_READ_UNREAD, aDate],
+    let timestamp = aMessage.timestamp;
 
-      delivery:       DELIVERY_RECEIVED,
-      deliveryStatus: DELIVERY_STATUS_SUCCESS,
-      sender:         sender,
-      receiver:       receiver,
-      body:           aBody,
-      messageClass:   aMessageClass,
-      timestamp:      aDate,
-      read:           FILTER_READ_UNREAD
-    };
-    return this.saveRecord(record, aCallback);
+    // Adding needed indexes and extra attributes for internal use.
+    aMessage.deliveryIndex = [DELIVERY_RECEIVED, timestamp];
+    aMessage.numberIndex = [[sender, timestamp], [receiver, timestamp]];
+    aMessage.readIndex = [FILTER_READ_UNREAD, timestamp];
+    aMessage.delivery = DELIVERY_RECEIVED;
+    aMessage.deliveryStatus = DELIVERY_STATUS_SUCCESS;
+    aMessage.receiver = receiver;
+    aMessage.read = FILTER_READ_UNREAD;
+
+    return this.saveRecord(aMessage, aCallback);
   },
 
-  saveSendingMessage: function saveSendingMessage(
-      aReceiver, aBody, aDeliveryStatus, aDate, aCallback) {
+  saveSendingMessage: function saveSendingMessage(aMessage, aCallback) {
+    if (aMessage.type === undefined ||
+        aMessage.receiver === undefined ||
+        aMessage.deliveryStatus === undefined ||
+        aMessage.timestamp === undefined) {
+      if (aCallback) {
+        aCallback.notify(Cr.NS_ERROR_FAILURE, null);
+      }
+      return;
+    }
+
+    let sender = this.getRilIccInfoMsisdn();
+    let receiver = aMessage.receiver;
+
     let rilContext = this.mRIL.rilContext;
-    let sender = rilContext.iccInfo
-               ? rilContext.iccInfo.msisdn
-               : null;
-
-    // Workaround an xpconnect issue with undefined string objects.
-    // See bug 808220
-    if (sender === undefined || sender === "undefined") {
-      sender = null;
-    }
-
-    let receiver = aReceiver;
-
     if (rilContext.voice.network.mcc === rilContext.iccInfo.mcc) {
-      if (receiver) {
-        let parsedNumber = PhoneNumberUtils.parse(receiver.toString());
-        receiver = (parsedNumber && parsedNumber.internationalNumber)
-                   ? parsedNumber.internationalNumber
-                   : receiver;
-      }
-
-      if (sender) {
-        let parsedNumber = PhoneNumberUtils.parse(sender.toString());
-        sender = (parsedNumber && parsedNumber.internationalNumber)
-                 ? parsedNumber.internationalNumber
-                 : sender;
-      }
+      receiver = aMessage.receiver = this.makePhoneNumberInternational(receiver);
+      sender = this.makePhoneNumberInternational(sender);
     }
 
-    let record = {
-      deliveryIndex:  [DELIVERY_SENDING, aDate],
-      numberIndex:    [[sender, aDate], [receiver, aDate]],
-      readIndex:      [FILTER_READ_READ, aDate],
+    let timestamp = aMessage.timestamp;
 
-      delivery:       DELIVERY_SENDING,
-      deliveryStatus: aDeliveryStatus,
-      sender:         sender,
-      receiver:       receiver,
-      body:           aBody,
-      messageClass:   MESSAGE_CLASS_NORMAL,
-      timestamp:      aDate,
-      read:           FILTER_READ_READ
-    };
-    return this.saveRecord(record, aCallback);
+    // Adding needed indexes and extra attributes for internal use.
+    aMessage.deliveryIndex = [DELIVERY_SENDING, timestamp];
+    aMessage.numberIndex = [[sender, timestamp], [receiver, timestamp]];
+    aMessage.readIndex = [FILTER_READ_READ, timestamp];
+    aMessage.delivery = DELIVERY_SENDING;
+    aMessage.sender = sender;
+    aMessage.messageClass = MESSAGE_CLASS_NORMAL;
+    aMessage.read = FILTER_READ_READ;
+
+    return this.saveRecord(aMessage, aCallback);
   },
 
   setMessageDelivery: function setMessageDelivery(
@@ -822,11 +816,7 @@ MobileMessageDatabaseService.prototype = {
       if (!callback) {
         return;
       }
-      let sms = null;
-      if (record) {
-        sms = self.createMessageFromRecord(record);
-      }
-      callback.notify(rv, sms);
+      callback.notify(rv, record);
     }
 
     this.newTxn(READ_WRITE, function (error, txn, store) {
@@ -914,7 +904,7 @@ MobileMessageDatabaseService.prototype = {
           aRequest.notifyGetMessageFailed(Ci.nsISmsRequest.UNKNOWN_ERROR);
           return;
         }
-        let sms = self.createMessageFromRecord(record);
+        let sms = self.createSmsMessageFromRecord(record);
         aRequest.notifyMessageGot(sms);
       };
 
@@ -1220,7 +1210,7 @@ MobileMessageDatabaseService.prototype = {
               // For all numbers.
               processing: filter.numbers.length,
               results: []
-	    }];
+            }];
 
             let timeRange = null;
             if (filter.startDate != null && filter.endDate != null) {
@@ -1327,7 +1317,7 @@ MobileMessageDatabaseService.prototype = {
           if (DEBUG) debug("Could not get message id " + messageId);
           aRequest.notifyReadMessageListFailed(Ci.nsISmsRequest.NOT_FOUND_ERROR);
         }
-        let sms = self.createMessageFromRecord(record);
+        let sms = self.createSmsMessageFromRecord(record);
         aRequest.notifyNextMessageInListGot(sms);
       };
 
diff --git a/dom/sms/tests/test_smsdatabaseservice.xul b/dom/sms/tests/test_smsdatabaseservice.xul
index 9f3f621f1e7..3bd3e523617 100644
--- a/dom/sms/tests/test_smsdatabaseservice.xul
+++ b/dom/sms/tests/test_smsdatabaseservice.xul
@@ -177,21 +177,27 @@ function newRandomId() {
 
 let sms = [
   {
+    type: "sms",
     sender: "+34666000000",
     receiver: "+34666111000",
     body: "message 0",
+    messageClass: "normal",
     timestamp: 1329999861762
   },
   {
+    type: "sms",
     sender: "+34666000111",
     receiver: "+34666111111",
     body: "message 1",
+    messageClass: "normal",
     timestamp: 1329999861763
   },
   {
+    type: "sms",
     sender: "+34666000222",
     receiver: "+34666111222",
     body: "message 2",
+    messageClass: "normal",
     timestamp: 1329999861764
   },
 ];
@@ -201,9 +207,7 @@ let sms = [
  */
 add_test(function test_saveReceivedMessage() {
   info("test_saveReceivedMessage");
-  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[0].sender,
-                                                                    sms[0].body,
-                                                                    sms[0].timestamp);
+  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[0]);
   checkDB(function (store) {
     let request = store.get(messageId);
     request.onsuccess = function onsuccess() {
@@ -262,9 +266,7 @@ add_test(function test_getMessage_success() {
       run_next_test();
     }
   });
-  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[2].sender,
-                                                                    sms[2].body,
-                                                                    sms[2].timestamp);
+  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[2]);
   SimpleTest.executeSoon(function () {
     gMobileMessageDatabaseService.getMessage(messageId, fakeRequestId);
   });
@@ -821,9 +823,7 @@ add_test(function test_deleteMessage_success() {
       run_next_test();
     }
   });
-  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[0].sender,
-                                                                    sms[0].body,
-                                                                    sms[0].timestamp);
+  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[0]);
   SimpleTest.executeSoon(function () {
     gMobileMessageDatabaseService.deleteMessage(messageId, fakeRequestId);
   });
@@ -852,9 +852,7 @@ add_test(function test_markMessageRead_success() {
       run_next_test();
     }
   });
-  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[2].sender,
-                                                                    sms[2].body,
-                                                                    sms[2].timestamp); 
+  let messageId = gMobileMessageDatabaseService.saveReceivedMessage(sms[2]); 
   SimpleTest.executeSoon(function () {
     gMobileMessageDatabaseService.markMessageRead(messageId, true, fakeRequestId);
   });
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 28e0cb51fe2..e2214d58340 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -1476,6 +1476,18 @@ RadioInterfaceLayer.prototype = {
                                      0, options);
   },
 
+  createSmsMessageFromRecord: function createSmsMessageFromRecord(aRecord) {
+    return gSmsService.createSmsMessage(aRecord.id,
+                                        aRecord.delivery,
+                                        aRecord.deliveryStatus,
+                                        aRecord.sender,
+                                        aRecord.receiver,
+                                        aRecord.body,
+                                        aRecord.messageClass,
+                                        aRecord.timestamp,
+                                        aRecord.read);
+  },
+
   portAddressedSmsApps: null,
   handleSmsReceived: function handleSmsReceived(message) {
     debug("handleSmsReceived: " + JSON.stringify(message));
@@ -1501,6 +1513,11 @@ RadioInterfaceLayer.prototype = {
       return true;
     }
 
+    message.type = "sms";
+    message.sender = message.sender || null;
+    message.receiver = message.receiver || null;
+    message.body = message.fullBody = message.fullBody || null;
+
     // 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.
@@ -1508,13 +1525,14 @@ RadioInterfaceLayer.prototype = {
 
     let mwi = message.mwi;
     if (mwi) {
-      mwi.returnNumber = message.sender || null;
-      mwi.returnMessage = message.fullBody || null;
+      mwi.returnNumber = message.sender;
+      mwi.returnMessage = message.fullBody;
       this._sendTargetMessage("voicemail", "RIL:VoicemailNotification", mwi);
       return true;
     }
 
-    let notifyReceived = function notifyReceived(rv, sms) {
+    let notifyReceived = function notifyReceived(rv, record) {
+      let sms = this.createSmsMessageFromRecord(record);
       let success = Components.isSuccessCode(rv);
 
       // Acknowledge the reception of the SMS.
@@ -1532,38 +1550,30 @@ RadioInterfaceLayer.prototype = {
       }
 
       gSystemMessenger.broadcastMessage("sms-received", {
-          id: message.id,
-          delivery: DOM_SMS_DELIVERY_RECEIVED,
-          deliveryStatus: RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS,
-          sender: message.sender || null,
-          receiver: message.receiver || null,
-          body: message.fullBody || null,
-          messageClass: message.messageClass,
-          timestamp: message.timestamp,
-          read: false
+        id: message.id,
+        delivery: DOM_SMS_DELIVERY_RECEIVED,
+        deliveryStatus: RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS,
+        sender: message.sender,
+        receiver: message.receiver,
+        body: message.fullBody,
+        messageClass: message.messageClass,
+        timestamp: message.timestamp,
+        read: false
       });
+
       Services.obs.notifyObservers(sms, kSmsReceivedObserverTopic, null);
     }.bind(this);
 
     if (message.messageClass != RIL.GECKO_SMS_MESSAGE_CLASSES[RIL.PDU_DCS_MSG_CLASS_0]) {
-      message.id = gMobileMessageDatabaseService.saveReceivedMessage(
-        message.sender || null,
-        message.fullBody || null,
-        message.messageClass,
-        message.timestamp,
-        notifyReceived);
+      message.id = gMobileMessageDatabaseService.saveReceivedMessage(message,
+                                                                     notifyReceived);
     } else {
       message.id = -1;
-      let sms = gSmsService.createSmsMessage(message.id,
-                                             DOM_SMS_DELIVERY_RECEIVED,
-                                             RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS,
-                                             message.sender || null,
-                                             message.receiver || null,
-                                             message.fullBody || null,
-                                             message.messageClass,
-                                             message.timestamp,
-                                             false);
-      notifyReceived(Cr.NS_OK, sms);
+      message.delivery = DOM_SMS_DELIVERY_RECEIVED;
+      message.deliveryStatus = RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS;
+      message.read = false;
+
+      notifyReceived(Cr.NS_OK, message);
     }
 
     // SMS ACK will be sent in notifyReceived. Return false here.
@@ -1596,7 +1606,8 @@ RadioInterfaceLayer.prototype = {
     gMobileMessageDatabaseService.setMessageDelivery(options.sms.id,
                                                      DOM_SMS_DELIVERY_SENT,
                                                      options.sms.deliveryStatus,
-                                                     function notifyResult(rv, sms) {
+                                                     function notifyResult(rv, record) {
+      let sms = this.createSmsMessageFromRecord(record);
       //TODO bug 832140 handle !Components.isSuccessCode(rv)
       gSystemMessenger.broadcastMessage("sms-sent",
                                         {id: options.sms.id,
@@ -1634,13 +1645,14 @@ RadioInterfaceLayer.prototype = {
     gMobileMessageDatabaseService.setMessageDelivery(options.sms.id,
                                                      options.sms.delivery,
                                                      message.deliveryStatus,
-                                                     function notifyResult(rv, sms) {
+                                                     function notifyResult(rv, record) {
+      let sms = this.createSmsMessageFromRecord(record);
       //TODO bug 832140 handle !Components.isSuccessCode(rv)
       let topic = (message.deliveryStatus == RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS)
                   ? kSmsDeliverySuccessObserverTopic
                   : kSmsDeliveryErrorObserverTopic;
       Services.obs.notifyObservers(sms, topic, null);
-    });
+    }.bind(this));
   },
 
   handleSmsSendFailed: function handleSmsSendFailed(message) {
@@ -1662,11 +1674,12 @@ RadioInterfaceLayer.prototype = {
     gMobileMessageDatabaseService.setMessageDelivery(options.sms.id,
                                                      DOM_SMS_DELIVERY_ERROR,
                                                      RIL.GECKO_SMS_DELIVERY_STATUS_ERROR,
-                                                     function notifyResult(rv, sms) {
+                                                     function notifyResult(rv, record) {
+      let sms = this.createSmsMessageFromRecord(record);
       //TODO bug 832140 handle !Components.isSuccessCode(rv)
       options.request.notifySendMessageFailed(error);
       Services.obs.notifyObservers(sms, kSmsFailedObserverTopic, null);
-    });
+    }.bind(this));
   },
 
   /**
@@ -2645,8 +2658,17 @@ RadioInterfaceLayer.prototype = {
     let deliveryStatus = options.requestStatusReport
                        ? RIL.GECKO_SMS_DELIVERY_STATUS_PENDING
                        : RIL.GECKO_SMS_DELIVERY_STATUS_NOT_APPLICABLE;
-    let id = gMobileMessageDatabaseService.saveSendingMessage(number, message, deliveryStatus, timestamp,
-                                                              function notifyResult(rv, sms) {
+    let sendingMessage = {
+      type: "sms",
+      receiver: number,
+      body: message,
+      deliveryStatus: deliveryStatus,
+      timestamp: timestamp
+    };
+
+    let id = gMobileMessageDatabaseService.saveSendingMessage(sendingMessage,
+                                                              function notifyResult(rv, record) {
+      let sms = this.createSmsMessageFromRecord(record);
       //TODO bug 832140 handle !Components.isSuccessCode(rv)
       Services.obs.notifyObservers(sms, kSmsSendingObserverTopic, null);
 

From 92eb08092d145ef42dc146da3378e3396ae352a1 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@iki.fi>
Date: Mon, 25 Feb 2013 17:12:13 +0200
Subject: [PATCH 12/64] Bug 844792 - Warn about the upcoming removal of
 multipart support in XHR. r=smaug.

---
 content/base/src/nsXMLHttpRequest.cpp       | 2 ++
 dom/locales/en-US/chrome/dom/dom.properties | 1 +
 2 files changed, 3 insertions(+)

diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp
index 4cf210070db..4147515dbac 100644
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -3371,6 +3371,8 @@ nsXMLHttpRequest::SetMultipart(bool aMultipart, nsresult& aRv)
     return;
   }
 
+  LogMessage("MultipartXHRWarning", GetOwner());
+
   if (aMultipart) {
     mState |= XML_HTTP_REQUEST_MULTIPART;
   } else {
diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties
index 52324c07b23..5efe29a0fe5 100644
--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -84,6 +84,7 @@ RemovedFullScreenElement=Exited full-screen because full-screen element was remo
 FocusedWindowedPluginWhileFullScreen=Exited full-screen because windowed plugin was focused.
 HTMLMultipartXHRWarning=HTML parsing in XMLHttpRequest is not supported for multipart responses.
 HTMLSyncXHRWarning=HTML parsing in XMLHttpRequest is not supported in the synchronous mode.
+MultipartXHRWarning=Support for multipart responses in XMLHttpRequest is going to be removed in an upcoming version. Please migrate to chunked responses or to Web Sockets.
 InvalidRedirectChannelWarning=Unable to redirect to %S because the channel doesn't implement nsIWritablePropertyBag2.
 ReportOnlyCSPIgnored=Report-only CSP policy will be ignored because there are other non-report-only CSP policies applied.
 ResponseTypeSyncXHRWarning=Use of XMLHttpRequest's responseType attribute is no longer supported in the synchronous mode in window context.

From 5ee039184ba6d385cd41b8232ed4dcdb2f17445f Mon Sep 17 00:00:00 2001
From: Marco Chen <mchen@mozilla.com>
Date: Mon, 25 Feb 2013 16:54:07 +0800
Subject: [PATCH 13/64] Bug 836655 - [Audio] To remove ChildID if there is no
 content channel playing in foreground. And only send audio-channel-changed
 with normal when ChildID in the background has content channel in playing
 state. r=baku

---
 dom/audiochannel/AudioChannelService.cpp | 38 ++++++++++++++++++------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/dom/audiochannel/AudioChannelService.cpp b/dom/audiochannel/AudioChannelService.cpp
index c1a0c8fcc27..24683a02d2a 100644
--- a/dom/audiochannel/AudioChannelService.cpp
+++ b/dom/audiochannel/AudioChannelService.cpp
@@ -135,6 +135,14 @@ AudioChannelService::UnregisterType(AudioChannelType aType,
   // In order to avoid race conditions, it's safer to notify any existing
   // agent any time a new one is registered.
   if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    // We only remove ChildID when it is in the foreground.
+    // If in the background, we kept ChildID for allowing it to play next song.
+    if (aType == AUDIO_CHANNEL_CONTENT &&
+        mActiveContentChildIDs.Contains(aChildID) &&
+        (!aElementHidden &&
+         !mChannelCounters[AUDIO_CHANNEL_INT_CONTENT].Contains(aChildID))) {
+      mActiveContentChildIDs.RemoveElement(aChildID);
+    }
     SendAudioChannelChangedNotification();
     Notify();
   }
@@ -175,23 +183,31 @@ AudioChannelService::GetMutedInternal(AudioChannelType aType, uint64_t aChildID,
 
   // If the audio content channel is visible, let's remember this ChildID.
   if (newType == AUDIO_CHANNEL_INT_CONTENT &&
-      oldType == AUDIO_CHANNEL_INT_CONTENT_HIDDEN &&
-      !mActiveContentChildIDs.Contains(aChildID)) {
+      oldType == AUDIO_CHANNEL_INT_CONTENT_HIDDEN) {
 
     if (mActiveContentChildIDsFrozen) {
       mActiveContentChildIDsFrozen = false;
       mActiveContentChildIDs.Clear();
     }
 
-    mActiveContentChildIDs.AppendElement(aChildID);
+    if (!mActiveContentChildIDs.Contains(aChildID)) {
+      mActiveContentChildIDs.AppendElement(aChildID);
+    }
   }
 
-  // If nothing is visible, the list has to been frozen.
   else if (newType == AUDIO_CHANNEL_INT_CONTENT_HIDDEN &&
            oldType == AUDIO_CHANNEL_INT_CONTENT &&
-           !mActiveContentChildIDsFrozen &&
-           mChannelCounters[AUDIO_CHANNEL_INT_CONTENT].IsEmpty()) {
-    mActiveContentChildIDsFrozen = true;
+           !mActiveContentChildIDsFrozen) {
+    // If nothing is visible, the list has to been frozen.
+    // Or if there is still any one with other ChildID in foreground then
+    // it should be removed from list and left other ChildIDs in the foreground
+    // to keep playing. Finally only last one childID which go to background
+    // will be in list.
+    if (mChannelCounters[AUDIO_CHANNEL_INT_CONTENT].IsEmpty()) {
+      mActiveContentChildIDsFrozen = true;
+    } else if (!mChannelCounters[AUDIO_CHANNEL_INT_CONTENT].Contains(aChildID)) {
+      mActiveContentChildIDs.RemoveElement(aChildID);
+    }
   }
 
   if (newType != oldType && aType == AUDIO_CHANNEL_CONTENT) {
@@ -291,8 +307,12 @@ AudioChannelService::SendAudioChannelChangedNotification()
       higher = AUDIO_CHANNEL_NOTIFICATION;
     }
 
-    // Content channels play in background if just one is active.
-    else if (!mActiveContentChildIDs.IsEmpty()) {
+    // There is only one Child can play content channel in the background.
+    // And need to check whether there is any content channels under playing
+    // now.
+    else if (!mActiveContentChildIDs.IsEmpty() &&
+             mChannelCounters[AUDIO_CHANNEL_INT_CONTENT_HIDDEN].Contains(
+             mActiveContentChildIDs[0])) {
       higher = AUDIO_CHANNEL_CONTENT;
     }
   }

From 39952e6c0f6d6a6040dc56831c6862a2d298bc79 Mon Sep 17 00:00:00 2001
From: Marco Chen <mchen@mozilla.com>
Date: Mon, 25 Feb 2013 16:55:24 +0800
Subject: [PATCH 14/64] Bug 836655 - Modify unit test for adapting change in
 this bug. r=baku

---
 .../tests/TestAudioChannelService.cpp         | 274 +++++++++++-------
 1 file changed, 175 insertions(+), 99 deletions(-)

diff --git a/dom/audiochannel/tests/TestAudioChannelService.cpp b/dom/audiochannel/tests/TestAudioChannelService.cpp
index d03e67e4a30..604a174a88b 100644
--- a/dom/audiochannel/tests/TestAudioChannelService.cpp
+++ b/dom/audiochannel/tests/TestAudioChannelService.cpp
@@ -1,6 +1,11 @@
 /* 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/. */
+#ifdef XP_WIN
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
 
 #include "TestHarness.h"
 
@@ -19,19 +24,25 @@
 
 using namespace mozilla::dom;
 
-class Agent
+class Agent : public nsIAudioChannelAgentCallback
 {
 public:
+  NS_DECL_ISUPPORTS
+
   Agent(AudioChannelType aType)
   : mType(aType)
+  , mWaitCallback(false)
   , mRegistered(false)
+  , mCanPlay(false)
   {
     mAgent = do_CreateInstance("@mozilla.org/audiochannelagent;1");
   }
 
+  virtual ~Agent() {}
+
   nsresult Init()
   {
-    nsresult rv = mAgent->Init(mType, nullptr);
+    nsresult rv = mAgent->Init(mType, this);
     NS_ENSURE_SUCCESS(rv, rv);
 
     return mAgent->SetVisibilityState(false);
@@ -50,26 +61,74 @@ public:
   nsresult StopPlaying()
   {
     mRegistered = false;
+    int loop = 0;
+    while (mWaitCallback) {
+      #ifdef XP_WIN
+      Sleep(1000);
+      #else
+      sleep(1);
+      #endif
+      if (loop++ == 5) {
+        TEST_ENSURE_BASE(false, "StopPlaying timeout");
+      }
+    }
     return mAgent->StopPlaying();
   }
 
+  nsresult SetVisibilityState(bool visible)
+  {
+    if (mRegistered) {
+      mWaitCallback = true;
+    }
+    return mAgent->SetVisibilityState(visible);
+  }
+
+  NS_IMETHODIMP CanPlayChanged(bool canPlay)
+  {
+    mCanPlay = canPlay;
+    mWaitCallback = false;
+    return NS_OK;
+  }
+
+  nsresult GetCanPlay(bool *_ret)
+  {
+    int loop = 0;
+    while (mWaitCallback) {
+      #ifdef XP_WIN
+      Sleep(1000);
+      #else
+      sleep(1);
+      #endif
+      if (loop++ == 5) {
+        TEST_ENSURE_BASE(false, "GetCanPlay timeout");
+      }
+    }
+    *_ret = mCanPlay;
+    return NS_OK;
+  }
+
   nsCOMPtr<AudioChannelAgent> mAgent;
   AudioChannelType mType;
+  bool mWaitCallback;
   bool mRegistered;
+  bool mCanPlay;
 };
 
+NS_IMPL_ISUPPORTS1(Agent, nsIAudioChannelAgentCallback)
+
 nsresult
 TestDoubleStartPlaying()
 {
-  Agent agent(AUDIO_CHANNEL_NORMAL);
-  nsresult rv = agent.Init();
+  nsCOMPtr<Agent> agent = new Agent(AUDIO_CHANNEL_NORMAL);
+
+  nsresult rv = agent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool playing;
-  rv = agent.mAgent->StartPlaying(&playing);
+  rv = agent->mAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = agent.mAgent->StartPlaying(&playing);
+  rv = agent->mAgent->StartPlaying(&playing);
   TEST_ENSURE_BASE(NS_FAILED(rv), "Test0: StartPlaying calling twice should return error");
 
   return NS_OK;
@@ -78,19 +137,19 @@ TestDoubleStartPlaying()
 nsresult
 TestOneNormalChannel()
 {
-  Agent agent(AUDIO_CHANNEL_NORMAL);
-  nsresult rv = agent.Init();
+  nsCOMPtr<Agent> agent = new Agent(AUDIO_CHANNEL_NORMAL);
+  nsresult rv = agent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool playing;
-  rv = agent.StartPlaying(&playing);
+  rv = agent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test1: A normal channel unvisible agent must not be playing");
 
-  rv = agent.mAgent->SetVisibilityState(true);
+  rv = agent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = agent.StartPlaying(&playing);
+  rv = agent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test1: A normal channel visible agent should be playing");
 
@@ -100,34 +159,34 @@ TestOneNormalChannel()
 nsresult
 TestTwoNormalChannels()
 {
-  Agent agent1(AUDIO_CHANNEL_NORMAL);
-  nsresult rv = agent1.Init();
+  nsCOMPtr<Agent> agent1 = new Agent(AUDIO_CHANNEL_NORMAL);
+  nsresult rv = agent1->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent agent2(AUDIO_CHANNEL_NORMAL);
-  rv = agent2.Init();
+  nsCOMPtr<Agent> agent2 = new Agent(AUDIO_CHANNEL_NORMAL);
+  rv = agent2->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool playing;
-  rv = agent1.StartPlaying(&playing);
+  rv = agent1->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test2: A normal channel unvisible agent1 must not be playing");
 
-  rv = agent2.StartPlaying(&playing);
+  rv = agent2->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test2: A normal channel unvisible agent2 must not be playing");
 
-  rv = agent1.mAgent->SetVisibilityState(true);
+  rv = agent1->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = agent2.mAgent->SetVisibilityState(true);
+  rv = agent2->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = agent1.StartPlaying(&playing);
+  rv = agent1->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test2: A normal channel visible agent1 should be playing");
 
-  rv = agent2.StartPlaying(&playing);
+  rv = agent2->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test2: A normal channel visible agent2 should be playing");
 
@@ -137,213 +196,230 @@ TestTwoNormalChannels()
 nsresult
 TestContentChannels()
 {
-  Agent agent1(AUDIO_CHANNEL_CONTENT);
-  nsresult rv = agent1.Init();
+  nsCOMPtr<Agent> agent1 = new Agent(AUDIO_CHANNEL_CONTENT);
+  nsresult rv = agent1->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent agent2(AUDIO_CHANNEL_CONTENT);
-  rv = agent2.Init();
+  nsCOMPtr<Agent> agent2 = new Agent(AUDIO_CHANNEL_CONTENT);
+  rv = agent2->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = agent1.mAgent->SetVisibilityState(true);
+  /* All content channels in the foreground can be allowed to play */
+  rv = agent1->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = agent2.mAgent->SetVisibilityState(true);
+  rv = agent2->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool playing;
-  rv = agent1.StartPlaying(&playing);
-  NS_ENSURE_SUCCESS(rv, rv);
-  TEST_ENSURE_BASE(playing, "Test3: A content channel unvisible agent1 should be playing");
-
-  rv = agent2.StartPlaying(&playing);
-  NS_ENSURE_SUCCESS(rv, rv);
-  TEST_ENSURE_BASE(playing, "Test3: A content channel unvisible agent2 should be playing");
-
-  rv = agent1.mAgent->SetVisibilityState(true);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = agent2.mAgent->SetVisibilityState(false);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = agent1.StartPlaying(&playing);
+  rv = agent1->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test3: A content channel visible agent1 should be playing");
 
-  rv = agent2.StartPlaying(&playing);
-  NS_ENSURE_SUCCESS(rv, rv);
-  TEST_ENSURE_BASE(playing, "Test3: A content channel unvisible agent2 should be playing");
-
-  rv = agent1.mAgent->SetVisibilityState(true);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = agent2.mAgent->SetVisibilityState(true);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = agent1.StartPlaying(&playing);
-  NS_ENSURE_SUCCESS(rv, rv);
-  TEST_ENSURE_BASE(playing, "Test3: A content channel visible agent1 should be playing");
-
-  rv = agent2.StartPlaying(&playing);
+  rv = agent2->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test3: A content channel visible agent2 should be playing");
 
+  /* Test the transition state of one content channel tried to set non-visible
+   * state first when app is going to background. */
+  rv = agent1->SetVisibilityState(false);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = agent1->GetCanPlay(&playing);
+  NS_ENSURE_SUCCESS(rv, rv);
+  TEST_ENSURE_BASE(playing, "Test3: A content channel unvisible agent1 should be playing from foreground to background");
+
+  /* Test all content channels set non-visible already */
+  rv = agent2->SetVisibilityState(false);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = agent2->GetCanPlay(&playing);
+  NS_ENSURE_SUCCESS(rv, rv);
+  TEST_ENSURE_BASE(playing, "Test3: A content channel unvisible agent2 should be playing from foreground to background");
+
+  /* Clear the content channels & mActiveContentChildIDs in AudioChannelService.
+   * If agent stop playing in the background, we will reserve it's childID in
+   * mActiveContentChildIDs, then it can allow to play next song. So we set agents
+   * to foreground first then stopping to play */
+  rv = agent1->SetVisibilityState(true);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = agent2->SetVisibilityState(true);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = agent1->StopPlaying();
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = agent2->StopPlaying();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  /* Test that content channels can't be allow to play when they starts from the background state */
+  rv = agent1->SetVisibilityState(false);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = agent2->SetVisibilityState(false);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = agent1->StartPlaying(&playing);
+  NS_ENSURE_SUCCESS(rv, rv);
+  TEST_ENSURE_BASE(!playing, "Test3: A content channel unvisible agent1 must not be playing from background state");
+
+  rv = agent2->StartPlaying(&playing);
+  NS_ENSURE_SUCCESS(rv, rv);
+  TEST_ENSURE_BASE(!playing, "Test3: A content channel unvisible agent2 must not be playing from background state");
+
   return rv;
 }
 
 nsresult
 TestPriorities()
 {
-  Agent normalAgent(AUDIO_CHANNEL_NORMAL);
-  nsresult rv = normalAgent.Init();
+  nsCOMPtr<Agent> normalAgent = new Agent(AUDIO_CHANNEL_NORMAL);
+  nsresult rv = normalAgent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent contentAgent(AUDIO_CHANNEL_CONTENT);
-  rv = contentAgent.Init();
+  nsCOMPtr<Agent> contentAgent = new Agent(AUDIO_CHANNEL_CONTENT);
+  rv = contentAgent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent notificationAgent(AUDIO_CHANNEL_NOTIFICATION);
-  rv = notificationAgent.Init();
+  nsCOMPtr<Agent> notificationAgent = new Agent(AUDIO_CHANNEL_NOTIFICATION);
+  rv = notificationAgent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent alarmAgent(AUDIO_CHANNEL_ALARM);
-  rv = alarmAgent.Init();
+  nsCOMPtr<Agent> alarmAgent = new Agent(AUDIO_CHANNEL_ALARM);
+  rv = alarmAgent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent telephonyAgent(AUDIO_CHANNEL_TELEPHONY);
-  rv = telephonyAgent.Init();
+  nsCOMPtr<Agent> telephonyAgent = new Agent(AUDIO_CHANNEL_TELEPHONY);
+  rv = telephonyAgent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent ringerAgent(AUDIO_CHANNEL_RINGER);
-  rv = ringerAgent.Init();
+  nsCOMPtr<Agent> ringerAgent = new Agent(AUDIO_CHANNEL_RINGER);
+  rv = ringerAgent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  Agent pNotificationAgent(AUDIO_CHANNEL_PUBLICNOTIFICATION);
-  rv = pNotificationAgent.Init();
+  nsCOMPtr<Agent> pNotificationAgent = new Agent(AUDIO_CHANNEL_PUBLICNOTIFICATION);
+  rv = pNotificationAgent->Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool playing;
 
   // Normal should not be playing because not visible.
-  rv = normalAgent.StartPlaying(&playing);
+  rv = normalAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
-  TEST_ENSURE_BASE(!playing, "Test4: A normal channel unvisible agent should not be playing");
+  TEST_ENSURE_BASE(!playing, "Test4: A normal channel unvisible agent must not be playing");
 
   // Content should be playing.
-  rv = contentAgent.StartPlaying(&playing);
+  rv = contentAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
-  TEST_ENSURE_BASE(playing, "Test4: A content channel unvisible agent should be playing");
+  TEST_ENSURE_BASE(!playing, "Test4: A content channel unvisible agent must not be playing from background state");
 
   // Notification should be playing.
-  rv = notificationAgent.StartPlaying(&playing);
+  rv = notificationAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: An notification channel unvisible agent should be playing");
 
   // Now content should be not playing because of the notification playing.
-  rv = contentAgent.StartPlaying(&playing);
+  rv = contentAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test4: A content channel unvisible agent should not be playing when notification channel is playing");
 
   // Adding an alarm.
-  rv = alarmAgent.StartPlaying(&playing);
+  rv = alarmAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: An alarm channel unvisible agent should be playing");
 
   // Now notification should be not playing because of the alarm playing.
-  rv = notificationAgent.StartPlaying(&playing);
+  rv = notificationAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test4: A notification channel unvisible agent should not be playing when an alarm is playing");
 
   // Adding an telephony.
-  rv = telephonyAgent.StartPlaying(&playing);
+  rv = telephonyAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: An telephony channel unvisible agent should be playing");
 
   // Now alarm should be not playing because of the telephony playing.
-  rv = alarmAgent.StartPlaying(&playing);
+  rv = alarmAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test4: A alarm channel unvisible agent should not be playing when a telephony is playing");
 
   // Adding an ringer.
-  rv = ringerAgent.StartPlaying(&playing);
+  rv = ringerAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: An ringer channel unvisible agent should be playing");
 
   // Now telephony should be not playing because of the ringer playing.
-  rv = telephonyAgent.StartPlaying(&playing);
+  rv = telephonyAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test4: A telephony channel unvisible agent should not be playing when a riger is playing");
 
   // Adding an pNotification.
-  rv = pNotificationAgent.StartPlaying(&playing);
+  rv = pNotificationAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: An pNotification channel unvisible agent should be playing");
 
   // Now ringer should be not playing because of the public notification playing.
-  rv = ringerAgent.StartPlaying(&playing);
+  rv = ringerAgent->StartPlaying(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(!playing, "Test4: A ringer channel unvisible agent should not be playing when a public notification is playing");
 
   // Settings visible the normal channel.
-  rv = normalAgent.mAgent->SetVisibilityState(true);
+  rv = normalAgent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Normal should be playing because visible.
-  rv = normalAgent.StartPlaying(&playing);
+  rv = normalAgent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: A normal channel visible agent should be playing");
 
   // Settings visible the content channel.
-  rv = contentAgent.mAgent->SetVisibilityState(true);
+  rv = contentAgent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Content should be playing because visible.
-  rv = contentAgent.StartPlaying(&playing);
+  rv = contentAgent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: A content channel visible agent should be playing");
 
   // Settings visible the notification channel.
-  rv = notificationAgent.mAgent->SetVisibilityState(true);
+  rv = notificationAgent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Notification should be playing because visible.
-  rv = notificationAgent.StartPlaying(&playing);
+  rv = notificationAgent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: A notification channel visible agent should be playing");
 
   // Settings visible the alarm channel.
-  rv = alarmAgent.mAgent->SetVisibilityState(true);
+  rv = alarmAgent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Alarm should be playing because visible.
-  rv = alarmAgent.StartPlaying(&playing);
+  rv = alarmAgent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: A alarm channel visible agent should be playing");
 
   // Settings visible the telephony channel.
-  rv = telephonyAgent.mAgent->SetVisibilityState(true);
+  rv = telephonyAgent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Telephony should be playing because visible.
-  rv = telephonyAgent.StartPlaying(&playing);
+  rv = telephonyAgent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: A telephony channel visible agent should be playing");
 
   // Settings visible the ringer channel.
-  rv = ringerAgent.mAgent->SetVisibilityState(true);
+  rv = ringerAgent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Ringer should be playing because visible.
-  rv = ringerAgent.StartPlaying(&playing);
+  rv = ringerAgent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: A ringer channel visible agent should be playing");
 
   // Settings visible the pNotification channel.
-  rv = pNotificationAgent.mAgent->SetVisibilityState(true);
+  rv = pNotificationAgent->SetVisibilityState(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // pNotification should be playing because visible.
-  rv = pNotificationAgent.StartPlaying(&playing);
+  rv = pNotificationAgent->GetCanPlay(&playing);
   NS_ENSURE_SUCCESS(rv, rv);
   TEST_ENSURE_BASE(playing, "Test4: A pNotification channel visible agent should be playing");
 

From 0dfdf59d242f586b78cda0b49e34d226611770c7 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Mon, 25 Feb 2013 15:56:19 +0000
Subject: [PATCH 15/64] bug 844454 - don't try to get a Unicode decoder for an
 empty charset name. r=hsivonen

---
 content/base/src/nsScriptLoader.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp
index 4abc02a6c09..3c52647aca2 100644
--- a/content/base/src/nsScriptLoader.cpp
+++ b/content/base/src/nsScriptLoader.cpp
@@ -1025,7 +1025,8 @@ nsScriptLoader::ConvertToUTF16(nsIChannel* aChannel, const uint8_t* aData,
 
   if (!unicodeDecoder &&
       aChannel &&
-      NS_SUCCEEDED(aChannel->GetContentCharset(charset))) {
+      NS_SUCCEEDED(aChannel->GetContentCharset(charset)) &&
+      !charset.IsEmpty()) {
     charsetConv->GetUnicodeDecoder(charset.get(),
                                    getter_AddRefs(unicodeDecoder));
   }

From 46779ca2d99ed56a5bd0e2566d55e6a0e4e29e06 Mon Sep 17 00:00:00 2001
From: EKR <ekr@rtfm.com>
Date: Tue, 19 Feb 2013 09:01:12 -0800
Subject: [PATCH 16/64] Bug 840508 - assert that nr_timer is called in the STS
 thread. r=abr

---
 media/mtransport/nr_timer.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/media/mtransport/nr_timer.cpp b/media/mtransport/nr_timer.cpp
index 80e83f4d23a..4517ddb126d 100644
--- a/media/mtransport/nr_timer.cpp
+++ b/media/mtransport/nr_timer.cpp
@@ -53,9 +53,11 @@
 
 #include "nsCOMPtr.h"
 #include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
 #include "nsIEventTarget.h"
 #include "nsITimer.h"
 #include "nsNetCID.h"
+#include "runnable_utils.h"
 
 extern "C" {
 #include "nr_api.h"
@@ -105,12 +107,25 @@ NS_IMETHODIMP nrappkitTimerCallback::Notify(nsITimer *timer) {
 
 using namespace mozilla;
 
+// These timers must only be used from the STS thread.
+// This function is a helper that enforces that.
+static void CheckSTSThread() {
+  nsresult rv;
+
+  nsCOMPtr<nsIEventTarget> sts_thread;
+
+  sts_thread = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
+
+  MOZ_ASSERT(NS_SUCCEEDED(rv));
+  ASSERT_ON_THREAD(sts_thread);
+}
+
 int NR_async_timer_set(int timeout, NR_async_cb cb, void *arg, char *func,
                        int l, void **handle) {
   nsresult rv;
+  CheckSTSThread();
 
   nsCOMPtr<nsITimer> timer = do_CreateInstance(NS_TIMER_CONTRACTID, &rv);
-
   if (NS_FAILED(rv)) {
     return(R_FAILED);
   }
@@ -134,10 +149,14 @@ int NR_async_timer_set(int timeout, NR_async_cb cb, void *arg, char *func,
 }
 
 int NR_async_schedule(NR_async_cb cb, void *arg, char *func, int l) {
+  // No need to check the thread because we check it next in the
+  // timer set.
   return NR_async_timer_set(0, cb, arg, func, l, nullptr);
 }
 
 int NR_async_timer_cancel(void *handle) {
+  CheckSTSThread();
+
   if (!handle)
     return 0;
 

From 5a5bc20b4543704b7640be5ebbe81a501aa0d93f Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 25 Feb 2013 11:33:29 -0500
Subject: [PATCH 17/64] Bug 831144 - Add Android XBL key bindings; r=neil

--HG--
rename : content/xbl/builtin/unix/Makefile.in => content/xbl/builtin/android/Makefile.in
rename : content/xbl/builtin/unix/jar.mn => content/xbl/builtin/android/jar.mn
---
 content/xbl/builtin/Makefile.in               |   4 +
 content/xbl/builtin/android/Makefile.in       |  13 ++
 content/xbl/builtin/android/jar.mn            |   6 +
 .../builtin/android/platformHTMLBindings.xml  | 170 ++++++++++++++++++
 4 files changed, 193 insertions(+)
 create mode 100644 content/xbl/builtin/android/Makefile.in
 create mode 100644 content/xbl/builtin/android/jar.mn
 create mode 100644 content/xbl/builtin/android/platformHTMLBindings.xml

diff --git a/content/xbl/builtin/Makefile.in b/content/xbl/builtin/Makefile.in
index c3a670f7571..928da3ccc8e 100644
--- a/content/xbl/builtin/Makefile.in
+++ b/content/xbl/builtin/Makefile.in
@@ -16,6 +16,9 @@ else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DIRS	= mac
 else
+ifeq (android,$(MOZ_WIDGET_TOOLKIT))
+DIRS	= android
+else
 ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
 DIRS	= unix
 else
@@ -23,5 +26,6 @@ DIRS	= emacs
 endif
 endif
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/xbl/builtin/android/Makefile.in b/content/xbl/builtin/android/Makefile.in
new file mode 100644
index 00000000000..955c2ba8abc
--- /dev/null
+++ b/content/xbl/builtin/android/Makefile.in
@@ -0,0 +1,13 @@
+# 
+# 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/.
+
+DEPTH		= @DEPTH@
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/content/xbl/builtin/android/jar.mn b/content/xbl/builtin/android/jar.mn
new file mode 100644
index 00000000000..9f05c2dd6cd
--- /dev/null
+++ b/content/xbl/builtin/android/jar.mn
@@ -0,0 +1,6 @@
+# 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/.
+
+toolkit.jar:
+* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/content/xbl/builtin/android/platformHTMLBindings.xml b/content/xbl/builtin/android/platformHTMLBindings.xml
new file mode 100644
index 00000000000..a67ce72ab4a
--- /dev/null
+++ b/content/xbl/builtin/android/platformHTMLBindings.xml
@@ -0,0 +1,170 @@
+<?xml version="1.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/. -->
+
+
+<bindings id="htmlBindings"
+   xmlns="http://www.mozilla.org/xbl"
+   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <binding id="inputFields">
+    <handlers>
+#include ../input-fields-base.inc
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
+
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
+
+      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
+
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
+      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
+    </handlers>
+  </binding>
+
+  <binding id="textAreas">
+    <handlers>
+#include ../textareas-base.inc
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
+
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
+
+      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
+
+      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
+      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
+
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
+      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
+    </handlers>
+  </binding>
+
+  <binding id="browser">
+    <handlers>
+#include ../browser-base.inc
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectWordPrevious" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectWordNext" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
+      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
+
+      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
+
+      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
+      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
+
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
+      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
+    </handlers>
+  </binding>
+
+  <binding id="editor">
+    <handlers>
+#include ../editor-base.inc
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
+
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
+
+      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
+
+      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
+      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
+
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
+      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
+    </handlers>
+  </binding>
+</bindings>

From 3ea987130f130fd6b6b0bb4d097c1b05830c3400 Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Mon, 25 Feb 2013 11:33:30 -0500
Subject: [PATCH 18/64] Bug 831144 - Properly pass meta states to Gecko;
 r=cpeterson

---
 mobile/android/base/GeckoEvent.java | 4 ++++
 widget/android/nsWindow.cpp         | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/GeckoEvent.java b/mobile/android/base/GeckoEvent.java
index 994c9e7688b..2c3ed6ea7c3 100644
--- a/mobile/android/base/GeckoEvent.java
+++ b/mobile/android/base/GeckoEvent.java
@@ -194,6 +194,10 @@ public class GeckoEvent {
         mFlags = k.getFlags();
         mKeyCode = k.getKeyCode();
         mUnicodeChar = k.getUnicodeChar();
+        if (mUnicodeChar == 0) {
+            // e.g. for Ctrl+A, Android returns 0, but Gecko expects 'a' as mUnicodeChar
+            mUnicodeChar = k.getUnicodeChar(0);
+        }
         mRepeatCount = k.getRepeatCount();
         mCharacters = k.getCharacters();
         mDomKeyLocation = isJoystickButton(mKeyCode) ? DOM_KEY_LOCATION_JOYSTICK : DOM_KEY_LOCATION_MOBILE;
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index e7dfb5c4702..c24c0cc312d 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -1501,10 +1501,10 @@ nsWindow::InitKeyEvent(nsKeyEvent& event, AndroidGeckoEvent& key,
         event.pluginEvent = pluginEvent;
     }
 
-    event.InitBasicModifiers(gMenu,
+    event.InitBasicModifiers(gMenu || key.IsCtrlPressed(),
                              key.IsAltPressed(),
                              key.IsShiftPressed(),
-                             false);
+                             key.IsMetaPressed());
     event.location = key.DomKeyLocation();
     event.time = key.Time();
 
@@ -1598,6 +1598,8 @@ nsWindow::OnKeyEvent(AndroidGeckoEvent *ae)
     case AndroidKeyEvent::KEYCODE_SHIFT_RIGHT:
     case AndroidKeyEvent::KEYCODE_ALT_LEFT:
     case AndroidKeyEvent::KEYCODE_ALT_RIGHT:
+    case AndroidKeyEvent::KEYCODE_CTRL_LEFT:
+    case AndroidKeyEvent::KEYCODE_CTRL_RIGHT:
         firePress = false;
         break;
     case AndroidKeyEvent::KEYCODE_BACK:

From defd4224684d035659695554483a9cc9cc80806d Mon Sep 17 00:00:00 2001
From: "Adam Roach [:abr]" <adam@nostrum.com>
Date: Mon, 25 Feb 2013 11:12:33 -0600
Subject: [PATCH 19/64] Bug 843595 - Null checks on pair dtor r=ekr

---
 .../nICEr/src/ice/ice_candidate_pair.c        |  8 ++-
 .../third_party/nICEr/src/ice/ice_peer_ctx.c  |  4 +-
 .../third_party/nICEr/src/net/nr_socket.c     |  5 +-
 .../signaling/test/signaling_unittests.cpp    | 68 +++++++++++++++++--
 4 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c b/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
index 547d354d60c..a5100b9775b 100644
--- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
@@ -172,9 +172,11 @@ int nr_ice_candidate_pair_destroy(nr_ice_cand_pair **pairp)
     RFREE(pair->as_string);
     RFREE(pair->foundation);
     nr_ice_socket_deregister(pair->local->isock,pair->stun_client_handle);
-    RFREE(pair->stun_client->params.ice_binding_request.username);
-    RFREE(pair->stun_client->params.ice_binding_request.password.data);
-    nr_stun_client_ctx_destroy(&pair->stun_client);
+    if (pair->stun_client) {
+      RFREE(pair->stun_client->params.ice_binding_request.username);
+      RFREE(pair->stun_client->params.ice_binding_request.password.data);
+      nr_stun_client_ctx_destroy(&pair->stun_client);
+    }
 
     RFREE(pair->r2l_user);
     RFREE(pair->r2l_pwd.data);
diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c b/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c
index 87b0189c164..b5e71b11d08 100644
--- a/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c
@@ -312,7 +312,9 @@ static void nr_ice_peer_ctx_destroy_cb(NR_SOCKET s, int how, void *cb_arg)
       STAILQ_REMOVE(&pctx->peer_streams,str1,nr_ice_media_stream_,entry);
       nr_ice_media_stream_destroy(&str1);
     }
-    STAILQ_REMOVE(&pctx->ctx->peers, pctx, nr_ice_peer_ctx_, entry);
+    assert(pctx->ctx);
+    if (pctx->ctx)
+      STAILQ_REMOVE(&pctx->ctx->peers, pctx, nr_ice_peer_ctx_, entry);
 
     RFREE(pctx);
   }
diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket.c b/media/mtransport/third_party/nICEr/src/net/nr_socket.c
index 5ec27ad25fc..7f37e582021 100644
--- a/media/mtransport/third_party/nICEr/src/net/nr_socket.c
+++ b/media/mtransport/third_party/nICEr/src/net/nr_socket.c
@@ -34,6 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 static char *RCSSTRING __UNUSED__="$Id: nr_socket.c,v 1.2 2008/04/28 17:59:02 ekr Exp $";
 
+#include <assert.h>
 #include <nr_api.h>
 #include "nr_socket.h"
 
@@ -65,7 +66,9 @@ int nr_socket_destroy(nr_socket **sockp)
     sock=*sockp;
     *sockp=0;
 
-    sock->vtbl->destroy(&sock->obj);
+    assert(sock->vtbl);
+    if (sock->vtbl)
+      sock->vtbl->destroy(&sock->obj);
 
     RFREE(sock);
 
diff --git a/media/webrtc/signaling/test/signaling_unittests.cpp b/media/webrtc/signaling/test/signaling_unittests.cpp
index 4863eb1c0ff..547db450b7e 100644
--- a/media/webrtc/signaling/test/signaling_unittests.cpp
+++ b/media/webrtc/signaling/test/signaling_unittests.cpp
@@ -746,20 +746,26 @@ void CreateAnswer(sipcc::MediaConstraints& constraints, std::string offer,
     offer_ = pObserver->lastString;
   }
 
-  void SetRemote(TestObserver::Action action, std::string remote) {
+  void SetRemote(TestObserver::Action action, std::string remote,
+                 bool ignoreError = false) {
     pObserver->state = TestObserver::stateNoResponse;
     ASSERT_EQ(pc->SetRemoteDescription(action, remote.c_str()), NS_OK);
     ASSERT_TRUE_WAIT(pObserver->state != TestObserver::stateNoResponse,
                      kDefaultTimeout);
-    ASSERT_TRUE(pObserver->state == TestObserver::stateSuccess);
+    if (!ignoreError) {
+      ASSERT_TRUE(pObserver->state == TestObserver::stateSuccess);
+    }
   }
 
-  void SetLocal(TestObserver::Action action, std::string local) {
+  void SetLocal(TestObserver::Action action, std::string local,
+                bool ignoreError = false) {
     pObserver->state = TestObserver::stateNoResponse;
     ASSERT_EQ(pc->SetLocalDescription(action, local.c_str()), NS_OK);
     ASSERT_TRUE_WAIT(pObserver->state != TestObserver::stateNoResponse,
                      kDefaultTimeout);
-    ASSERT_TRUE(pObserver->state == TestObserver::stateSuccess);
+    if (!ignoreError) {
+      ASSERT_TRUE(pObserver->state == TestObserver::stateSuccess);
+    }
   }
 
   void DoTrickleIce(ParsedSDP &sdp) {
@@ -1934,6 +1940,60 @@ TEST_F(SignalingAgentTest, CreateUntilFailThenWait) {
   PR_Sleep(10000);  // Wait to see if we crash
 }
 
+/*
+ * Test for Bug 843595
+ */
+TEST_F(SignalingTest, missingUfrag)
+{
+  sipcc::MediaConstraints constraints;
+  std::string offer =
+    "v=0\r\n"
+    "o=Mozilla-SIPUA 2208 0 IN IP4 0.0.0.0\r\n"
+    "s=SIP Call\r\n"
+    "t=0 0\r\n"
+    "a=ice-pwd:4450d5a4a5f097855c16fa079893be18\r\n"
+    "a=fingerprint:sha-256 23:9A:2E:43:94:42:CF:46:68:FC:62:F9:F4:48:61:DB:"
+      "2F:8C:C9:FF:6B:25:54:9D:41:09:EF:83:A8:19:FC:B6\r\n"
+    "m=audio 56187 RTP/SAVPF 109 0 8 101\r\n"
+    "c=IN IP4 77.9.79.167\r\n"
+    "a=rtpmap:109 opus/48000/2\r\n"
+    "a=ptime:20\r\n"
+    "a=rtpmap:0 PCMU/8000\r\n"
+    "a=rtpmap:8 PCMA/8000\r\n"
+    "a=rtpmap:101 telephone-event/8000\r\n"
+    "a=fmtp:101 0-15\r\n"
+    "a=sendrecv\r\n"
+    "a=candidate:0 1 UDP 2113601791 192.168.178.20 56187 typ host\r\n"
+    "a=candidate:1 1 UDP 1694236671 77.9.79.167 56187 typ srflx raddr "
+      "192.168.178.20 rport 56187\r\n"
+    "a=candidate:0 2 UDP 2113601790 192.168.178.20 52955 typ host\r\n"
+    "a=candidate:1 2 UDP 1694236670 77.9.79.167 52955 typ srflx raddr "
+      "192.168.178.20 rport 52955\r\n"
+    "m=video 49929 RTP/SAVPF 120\r\n"
+    "c=IN IP4 77.9.79.167\r\n"
+    "a=rtpmap:120 VP8/90000\r\n"
+    "a=recvonly\r\n"
+    "a=candidate:0 1 UDP 2113601791 192.168.178.20 49929 typ host\r\n"
+    "a=candidate:1 1 UDP 1694236671 77.9.79.167 49929 typ srflx raddr "
+      "192.168.178.20 rport 49929\r\n"
+    "a=candidate:0 2 UDP 2113601790 192.168.178.20 50769 typ host\r\n"
+    "a=candidate:1 2 UDP 1694236670 77.9.79.167 50769 typ srflx raddr "
+      "192.168.178.20 rport 50769\r\n"
+    "m=application 54054 SCTP/DTLS 5000 \r\n"
+    "c=IN IP4 77.9.79.167\r\n"
+    "a=fmtp:HuRUu]Dtcl\\zM,7(OmEU%O$gU]x/z\tD protocol=webrtc-datachannel;"
+      "streams=16\r\n"
+    "a=sendrecv\r\n";
+
+  a1_.SetLocal(TestObserver::OFFER, offer, true);
+  a2_.SetRemote(TestObserver::OFFER, offer, true);
+  a2_.CreateAnswer(constraints, offer, OFFER_AV | ANSWER_AV);
+  a2_.SetLocal(TestObserver::ANSWER, a2_.answer(), true);
+  a1_.SetRemote(TestObserver::ANSWER, a2_.answer(), true);
+  // We don't check anything in particular for success here -- simply not
+  // crashing by now is enough to declare success.
+}
+
 } // End namespace test.
 
 int main(int argc, char **argv) {

From f6564cf84f4ca24b805707b90ca4398a0f468f5f Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 25 Feb 2013 12:35:33 -0500
Subject: [PATCH 20/64] Backed out changesets 77a94dc888c9 and 3f6e6912e71a
 (bug 831144) for Android mochitest failures on a CLOSED TREE.

---
 content/xbl/builtin/Makefile.in               |   4 -
 content/xbl/builtin/android/Makefile.in       |  13 --
 content/xbl/builtin/android/jar.mn            |   6 -
 .../builtin/android/platformHTMLBindings.xml  | 170 ------------------
 mobile/android/base/GeckoEvent.java           |   4 -
 widget/android/nsWindow.cpp                   |   6 +-
 6 files changed, 2 insertions(+), 201 deletions(-)
 delete mode 100644 content/xbl/builtin/android/Makefile.in
 delete mode 100644 content/xbl/builtin/android/jar.mn
 delete mode 100644 content/xbl/builtin/android/platformHTMLBindings.xml

diff --git a/content/xbl/builtin/Makefile.in b/content/xbl/builtin/Makefile.in
index 928da3ccc8e..c3a670f7571 100644
--- a/content/xbl/builtin/Makefile.in
+++ b/content/xbl/builtin/Makefile.in
@@ -16,9 +16,6 @@ else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DIRS	= mac
 else
-ifeq (android,$(MOZ_WIDGET_TOOLKIT))
-DIRS	= android
-else
 ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
 DIRS	= unix
 else
@@ -26,6 +23,5 @@ DIRS	= emacs
 endif
 endif
 endif
-endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/content/xbl/builtin/android/Makefile.in b/content/xbl/builtin/android/Makefile.in
deleted file mode 100644
index 955c2ba8abc..00000000000
--- a/content/xbl/builtin/android/Makefile.in
+++ /dev/null
@@ -1,13 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/content/xbl/builtin/android/jar.mn b/content/xbl/builtin/android/jar.mn
deleted file mode 100644
index 9f05c2dd6cd..00000000000
--- a/content/xbl/builtin/android/jar.mn
+++ /dev/null
@@ -1,6 +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/.
-
-toolkit.jar:
-* content/global/platformHTMLBindings.xml   (platformHTMLBindings.xml)
diff --git a/content/xbl/builtin/android/platformHTMLBindings.xml b/content/xbl/builtin/android/platformHTMLBindings.xml
deleted file mode 100644
index a67ce72ab4a..00000000000
--- a/content/xbl/builtin/android/platformHTMLBindings.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.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/. -->
-
-
-<bindings id="htmlBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="inputFields">
-    <handlers>
-#include ../input-fields-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-
-  <binding id="textAreas">
-    <handlers>
-#include ../textareas-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-
-  <binding id="browser">
-    <handlers>
-#include ../browser-base.inc
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectWordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectWordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
-      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-
-  <binding id="editor">
-    <handlers>
-#include ../editor-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectEndLine"/>
-
-      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="alt" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="alt" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift,alt" command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift,alt" command="cmd_selectBottom"/>
-
-      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
-
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift" command="cmd_deleteCharForward"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="shift,alt" command="cmd_deleteToEndOfLine"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_deleteToBeginningOfLine"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="alt" command="cmd_deleteToEndOfLine"/>
-    </handlers>
-  </binding>
-</bindings>
diff --git a/mobile/android/base/GeckoEvent.java b/mobile/android/base/GeckoEvent.java
index 2c3ed6ea7c3..994c9e7688b 100644
--- a/mobile/android/base/GeckoEvent.java
+++ b/mobile/android/base/GeckoEvent.java
@@ -194,10 +194,6 @@ public class GeckoEvent {
         mFlags = k.getFlags();
         mKeyCode = k.getKeyCode();
         mUnicodeChar = k.getUnicodeChar();
-        if (mUnicodeChar == 0) {
-            // e.g. for Ctrl+A, Android returns 0, but Gecko expects 'a' as mUnicodeChar
-            mUnicodeChar = k.getUnicodeChar(0);
-        }
         mRepeatCount = k.getRepeatCount();
         mCharacters = k.getCharacters();
         mDomKeyLocation = isJoystickButton(mKeyCode) ? DOM_KEY_LOCATION_JOYSTICK : DOM_KEY_LOCATION_MOBILE;
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index c24c0cc312d..e7dfb5c4702 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -1501,10 +1501,10 @@ nsWindow::InitKeyEvent(nsKeyEvent& event, AndroidGeckoEvent& key,
         event.pluginEvent = pluginEvent;
     }
 
-    event.InitBasicModifiers(gMenu || key.IsCtrlPressed(),
+    event.InitBasicModifiers(gMenu,
                              key.IsAltPressed(),
                              key.IsShiftPressed(),
-                             key.IsMetaPressed());
+                             false);
     event.location = key.DomKeyLocation();
     event.time = key.Time();
 
@@ -1598,8 +1598,6 @@ nsWindow::OnKeyEvent(AndroidGeckoEvent *ae)
     case AndroidKeyEvent::KEYCODE_SHIFT_RIGHT:
     case AndroidKeyEvent::KEYCODE_ALT_LEFT:
     case AndroidKeyEvent::KEYCODE_ALT_RIGHT:
-    case AndroidKeyEvent::KEYCODE_CTRL_LEFT:
-    case AndroidKeyEvent::KEYCODE_CTRL_RIGHT:
         firePress = false;
         break;
     case AndroidKeyEvent::KEYCODE_BACK:

From 36a231a8ac620443a58d98756966434d8e037ade Mon Sep 17 00:00:00 2001
From: Kyle Huey <khuey@kylehuey.com>
Date: Sun, 24 Feb 2013 12:36:44 -0800
Subject: [PATCH 21/64] Bug 784812: Implement real dependencies for WebIDL
 bindings. r=bz,ted

---
 dom/bindings/BindingGen.py                    |  31 +++--
 dom/bindings/Codegen.py                       |  38 ++++++
 dom/bindings/Makefile.in                      |  42 ++++++-
 dom/bindings/parser/WebIDL.py                 | 119 +++++++++++++++++-
 .../parser/tests/test_nullable_equivalency.py |   2 +-
 dom/bindings/test/Makefile.in                 |   1 -
 6 files changed, 213 insertions(+), 20 deletions(-)

diff --git a/dom/bindings/BindingGen.py b/dom/bindings/BindingGen.py
index 3c8c30d7e1b..07cf5c9958a 100644
--- a/dom/bindings/BindingGen.py
+++ b/dom/bindings/BindingGen.py
@@ -5,46 +5,53 @@
 import os
 import cPickle
 from Configuration import Configuration
-from Codegen import CGBindingRoot, replaceFileIfChanged
+from Codegen import CGBindingRoot
 
-def generate_binding_header(config, outputprefix, webidlfile):
+def generate_binding_header(config, outputprefix, srcprefix, webidlfile):
     """
     |config| Is the configuration object.
     |outputprefix| is a prefix to use for the header guards and filename.
     """
 
     filename = outputprefix + ".h"
+    depsname = ".deps/" + filename + ".pp"
     root = CGBindingRoot(config, outputprefix, webidlfile)
-    if replaceFileIfChanged(filename, root.declare()):
-        print "Generating binding header: %s" % (filename)
+    with open(filename, 'wb') as f:
+        f.write(root.declare())
+    with open(depsname, 'wb') as f:
+        f.write("\n".join(filename + ": " + os.path.join(srcprefix, x) for x in root.deps()))
 
-def generate_binding_cpp(config, outputprefix, webidlfile):
+def generate_binding_cpp(config, outputprefix, srcprefix, webidlfile):
     """
     |config| Is the configuration object.
     |outputprefix| is a prefix to use for the header guards and filename.
     """
 
     filename = outputprefix + ".cpp"
+    depsname = ".deps/" + filename + ".pp"
     root = CGBindingRoot(config, outputprefix, webidlfile)
-    if replaceFileIfChanged(filename, root.define()):
-        print "Generating binding implementation: %s" % (filename)
+    with open(filename, 'wb') as f:
+        f.write(root.define())
+    with open(depsname, 'wb') as f:
+        f.write("\n".join(filename + ": " + os.path.join(srcprefix, x) for x in root.deps()))
 
 def main():
 
     # Parse arguments.
     from optparse import OptionParser
-    usagestring = "usage: %prog [header|cpp] configFile outputPrefix webIDLFile"
+    usagestring = "usage: %prog [header|cpp] configFile outputPrefix srcPrefix webIDLFile"
     o = OptionParser(usage=usagestring)
     o.add_option("--verbose-errors", action='store_true', default=False,
                  help="When an error happens, display the Python traceback.")
     (options, args) = o.parse_args()
 
-    if len(args) != 4 or (args[0] != "header" and args[0] != "cpp"):
+    if len(args) != 5 or (args[0] != "header" and args[0] != "cpp"):
         o.error(usagestring)
     buildTarget = args[0]
     configFile = os.path.normpath(args[1])
     outputPrefix = args[2]
-    webIDLFile = os.path.normpath(args[3])
+    srcPrefix = os.path.normpath(args[3])
+    webIDLFile = os.path.normpath(args[4])
 
     # Load the parsing results
     f = open('ParserResults.pkl', 'rb')
@@ -56,9 +63,9 @@ def main():
 
     # Generate the prototype classes.
     if buildTarget == "header":
-        generate_binding_header(config, outputPrefix, webIDLFile);
+        generate_binding_header(config, outputPrefix, srcPrefix, webIDLFile);
     elif buildTarget == "cpp":
-        generate_binding_cpp(config, outputPrefix, webIDLFile);
+        generate_binding_cpp(config, outputPrefix, srcPrefix, webIDLFile);
     else:
         assert False # not reached
 
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index bd446138adc..55a3a5e07e4 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -59,6 +59,9 @@ class CGThing():
     def define(self):
         """Produce code for a cpp file."""
         assert(False) # Override me!
+    def deps(self):
+        """Produce the deps for a pp file"""
+        assert(False) # Override me!
 
 class CGNativePropertyHooks(CGThing):
     """
@@ -309,6 +312,13 @@ class CGList(CGThing):
         return self.join(child.declare() for child in self.children if child is not None)
     def define(self):
         return self.join(child.define() for child in self.children if child is not None)
+    def deps(self):
+        deps = set()
+        for child in self.children:
+            if child is None:
+                continue
+            deps = deps.union(child.deps())
+        return deps
 
 class CGGeneric(CGThing):
     """
@@ -322,6 +332,8 @@ class CGGeneric(CGThing):
         return self.declareText
     def define(self):
         return self.defineText
+    def deps(self):
+        return set()
 
 # We'll want to insert the indent at the beginnings of lines, but we
 # don't want to indent empty lines.  So only indent lines that have a
@@ -387,6 +399,9 @@ class CGWrapper(CGThing):
                 defn.replace("\n", "\n" + (" " * len(self.definePre))))
         return self.definePre + defn + self.definePost
 
+    def deps(self):
+        return self.child.deps()
+
 class CGIfWrapper(CGWrapper):
     def __init__(self, child, condition):
         pre = CGWrapper(CGGeneric(condition), pre="if (", post=") {\n",
@@ -4853,6 +4868,9 @@ class CGEnum(CGThing):
 """ % (len(self.enum.values()) + 1,
        ",\n    ".join(['{"' + val + '", ' + str(len(val)) + '}' for val in self.enum.values()]))
 
+    def deps(self):
+        return self.enum.getDeps()
+
 def getUnionAccessorSignatureType(type, descriptorProvider):
     """
     Returns the types that are used in the getter and setter signatures for
@@ -5743,6 +5761,8 @@ class CGPrototypeTraitsClass(CGClass):
                          templateArgs=templateArgs,
                          templateSpecialization=templateSpecialization,
                          enums=enums, typedefs=typedefs, isStruct=True)
+    def deps(self):
+        return set()
 
 class CGPrototypeIDMapClass(CGClass):
     def __init__(self, descriptor, indent=''):
@@ -5754,6 +5774,8 @@ class CGPrototypeIDMapClass(CGClass):
                          templateArgs=templateArgs,
                          templateSpecialization=templateSpecialization,
                          enums=enums, isStruct=True)
+    def deps(self):
+        return set()
 
 class CGClassForwardDeclare(CGThing):
     def __init__(self, name, isStruct=False):
@@ -5766,6 +5788,8 @@ class CGClassForwardDeclare(CGThing):
     def define(self):
         # Header only
         return ''
+    def deps(self):
+        return set()
 
 class CGProxySpecialOperation(CGPerSignatureCall):
     """
@@ -6442,6 +6466,8 @@ class CGDescriptor(CGThing):
 
         assert not descriptor.concrete or descriptor.interface.hasInterfacePrototypeObject()
 
+        self._deps = descriptor.interface.getDeps()
+
         cgThings = []
         # These are set to true if at least one non-static
         # method/getter/setter exist on the interface.
@@ -6578,6 +6604,8 @@ class CGDescriptor(CGThing):
         return self.cgRoot.declare()
     def define(self):
         return self.cgRoot.define()
+    def deps(self):
+        return self._deps
 
 class CGNamespacedEnum(CGThing):
     def __init__(self, namespace, enumName, names, values, comment=""):
@@ -6782,6 +6810,9 @@ class CGDictionary(CGThing):
                 "defineMembers": "\n\n".join(memberDefines)
                 })
 
+    def deps(self):
+        return self.dictionary.getDeps()
+
     @staticmethod
     def makeDictionaryName(dictionary, workers):
         suffix = "Workers" if workers else ""
@@ -7203,6 +7234,9 @@ class CGBindingRoot(CGThing):
     def define(self):
         return stripTrailingWhitespace(self.root.define())
 
+    def deps(self):
+        return self.root.deps()
+
 class CGNativeMember(ClassMethod):
     def __init__(self, descriptor, member, name, signature, extendedAttrs,
                  breakAfter=True, passCxAsNeeded=True, visibility="public",
@@ -7778,6 +7812,7 @@ class CGCallback(CGClass):
     def __init__(self, idlObject, descriptorProvider, baseName, methods,
                  getters=[], setters=[]):
         self.baseName = baseName
+        self._deps = idlObject.getDeps()
         name = idlObject.identifier.name
         if descriptorProvider.workers:
             name += "Workers"
@@ -7867,6 +7902,9 @@ class CGCallback(CGClass):
                             body=bodyWithoutThis),
                 method]
 
+    def deps(self):
+        return self._deps
+
 class CGCallbackFunction(CGCallback):
     def __init__(self, callback, descriptorProvider):
         CGCallback.__init__(self, callback, descriptorProvider,
diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in
index db84b09eccf..5898408e1de 100644
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -75,7 +75,6 @@ EXPORTS_$(binding_include_path) = \
   TypedArray.h \
   UnionConversions.h \
   UnionTypes.h \
-  $(exported_binding_headers) \
   $(NULL)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/js/xpconnect/src \
@@ -97,8 +96,34 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
+# XXXkhuey this is a terrible hack to avoid blowing out the command line
+ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
+$(shell echo "$(addsuffix .pp,$(binding_header_files))" > pp.list)
+$(shell echo "$(addsuffix .pp,$(binding_cpp_files))" >> pp.list)
+
+# The script mddepend.pl checks the dependencies and writes to stdout
+# one rule to force out-of-date objects. For example,
+#   foo.o boo.o: FORCE
+# The script has an advantage over including the *.pp files directly
+# because it handles the case when header files are removed from the build.
+# 'make' would complain that there is no way to build missing headers.
+ALL_PP_RESULTS = $(shell cat pp.list | $(PERL) $(BUILD_TOOLS)/mddepend.pl)
+$(eval $(ALL_PP_RESULTS))
+
+endif
+
+EXPORTS_GENERATED_FILES := $(exported_binding_headers)
+EXPORTS_GENERATED_DEST := $(DIST)/include/$(binding_include_path)
+EXPORTS_GENERATED_TARGET := webidl-export
+INSTALL_TARGETS += EXPORTS_GENERATED
+
 include $(topsrcdir)/config/rules.mk
 
+# We need to create a separate target so we can ensure that the pickle is
+# done before generating headers.
+export:: ParserResults.pkl
+	$(MAKE) webidl-export
+
 # If you change bindinggen_dependencies here, change it in
 # dom/bindings/test/Makefile.in too.
 bindinggen_dependencies := \
@@ -107,7 +132,6 @@ bindinggen_dependencies := \
   Configuration.py \
   Codegen.py \
   parser/WebIDL.py \
-  ParserResults.pkl \
   $(GLOBAL_DEPS) \
   $(NULL)
 
@@ -129,20 +153,26 @@ $(test_webidl_files): %: $(srcdir)/test/%
 
 $(binding_header_files): %Binding.h: $(bindinggen_dependencies) \
                                      %.webidl \
+                                     $(call mkdir_deps,$(MDDEPDIR)) \
                                      $(NULL)
 	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  $(PLY_INCLUDE) -I$(srcdir)/parser \
 	  $(srcdir)/BindingGen.py header \
-	  $(srcdir)/Bindings.conf $*Binding \
+	  $(srcdir)/Bindings.conf \
+	  $*Binding \
+	  $(topsrcdir)/dom/webidl/ \
 	  $*.webidl
 
 $(binding_cpp_files): %Binding.cpp: $(bindinggen_dependencies) \
                                     %.webidl \
+                                    $(call mkdir_deps,$(MDDEPDIR)) \
                                     $(NULL)
 	PYTHONDONTWRITEBYTECODE=1 $(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  $(PLY_INCLUDE) -I$(srcdir)/parser \
 	  $(srcdir)/BindingGen.py cpp \
-	  $(srcdir)/Bindings.conf $*Binding \
+	  $(srcdir)/Bindings.conf \
+	  $*Binding \
+	  $(topsrcdir)/dom/webidl/ \
 	  $*.webidl
 
 $(globalgen_targets): ParserResults.pkl
@@ -195,4 +225,6 @@ GARBAGE += \
 # don't have issues with .cpp files being compiled before we've generated the
 # headers they depend on.  This is really only needed for the test files, since
 # the non-test headers are all exported above anyway.
-export:: $(binding_header_files)
+webidl-export:: $(binding_header_files)
+
+.PHONY: webidl-export
diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py
index 112c040973b..fa79a042e30 100644
--- a/dom/bindings/parser/WebIDL.py
+++ b/dom/bindings/parser/WebIDL.py
@@ -174,6 +174,38 @@ class IDLObject(object):
     def handleExtendedAttribute(self, attr):
         assert False # Override me!
 
+    def _getDependentObjects(self):
+        assert False # Override me!
+
+    def getDeps(self, visited=None):
+        """ Return a set of files that this object depends on.  If any of
+            these files are changed the parser needs to be rerun to regenerate
+            a new IDLObject.
+
+            The visited argument is a set of all the objects already visited.
+            We must test to see if we are in it, and if so, do nothing.  This
+            prevents infinite recursion."""
+
+        # NB: We can't use visited=set() above because the default value is
+        # evaluated when the def statement is evaluated, not when the function
+        # is executed, so there would be one set for all invocations.
+        if visited == None:
+            visited = set()
+
+        if self in visited:
+            return set()
+
+        visited.add(self)
+
+        deps = set()
+        if self.filename() != "<builtin>":
+            deps.add(self.filename())
+
+        for d in self._getDependentObjects():
+            deps = deps.union(d.getDeps(visited))
+
+        return deps
+
 class IDLScope(IDLObject):
     def __init__(self, location, parentScope, identifier):
         IDLObject.__init__(self, location)
@@ -443,6 +475,9 @@ class IDLExternalInterface(IDLObjectWithIdentifier):
     def resolve(self, parentScope):
         pass
 
+    def _getDependentObjects(self):
+        return set()
+
 class IDLInterface(IDLObjectWithScope):
     def __init__(self, location, parentScope, name, parent, members,
                  isPartial):
@@ -916,6 +951,13 @@ class IDLInterface(IDLObjectWithScope):
         # Put the new members at the beginning
         self.members = members + self.members
 
+    def _getDependentObjects(self):
+        deps = set(self.members)
+        deps.union(self.implementedInterfaces)
+        if self.parent:
+            deps.add(self.parent)
+        return deps
+
 class IDLDictionary(IDLObjectWithScope):
     def __init__(self, location, parentScope, name, parent, members):
         assert isinstance(parentScope, IDLScope)
@@ -986,6 +1028,11 @@ class IDLDictionary(IDLObjectWithScope):
     def addExtendedAttributes(self, attrs):
         assert len(attrs) == 0
 
+    def _getDependentObjects(self):
+        deps = set(self.members)
+        if (self.parent):
+            deps.add(self.parent)
+        return deps
 
 class IDLEnum(IDLObjectWithIdentifier):
     def __init__(self, location, parentScope, name, values):
@@ -1014,6 +1061,9 @@ class IDLEnum(IDLObjectWithIdentifier):
     def addExtendedAttributes(self, attrs):
         assert len(attrs) == 0
 
+    def _getDependentObjects(self):
+        return set()
+
 class IDLType(IDLObject):
     Tags = enum(
         # The integer types
@@ -1303,6 +1353,9 @@ class IDLNullableType(IDLType):
             return False
         return self.inner.isDistinguishableFrom(other)
 
+    def _getDependentObjects(self):
+        return self.inner._getDependentObjects()
+
 class IDLSequenceType(IDLType):
     def __init__(self, location, parameterType):
         assert not parameterType.isVoid()
@@ -1373,6 +1426,9 @@ class IDLSequenceType(IDLType):
         return (other.isPrimitive() or other.isString() or other.isEnum() or
                 other.isDate() or other.isNonCallbackInterface())
 
+    def _getDependentObjects(self):
+        return self.inner._getDependentObjects()
+
 class IDLUnionType(IDLType):
     def __init__(self, location, memberTypes):
         IDLType.__init__(self, location, "")
@@ -1476,6 +1532,9 @@ class IDLUnionType(IDLType):
                 return False
         return True
 
+    def _getDependentObjects(self):
+        return set(self.memberTypes)
+
 class IDLArrayType(IDLType):
     def __init__(self, location, parameterType):
         assert not parameterType.isVoid()
@@ -1551,6 +1610,9 @@ class IDLArrayType(IDLType):
         return (other.isPrimitive() or other.isString() or other.isEnum() or
                 other.isDate() or other.isNonCallbackInterface())
 
+    def _getDependentObjects(self):
+        return self.inner._getDependentObjects()
+
 class IDLTypedefType(IDLType, IDLObjectWithIdentifier):
     def __init__(self, location, innerType, name):
         IDLType.__init__(self, location, innerType.name)
@@ -1638,6 +1700,9 @@ class IDLTypedefType(IDLType, IDLObjectWithIdentifier):
     def isDistinguishableFrom(self, other):
         return self.inner.isDistinguishableFrom(other)
 
+    def _getDependentObjects(self):
+        return self.inner._getDependentObjects()
+
 class IDLWrapperType(IDLType):
     def __init__(self, location, inner):
         IDLType.__init__(self, location, inner.identifier.name)
@@ -1741,6 +1806,23 @@ class IDLWrapperType(IDLType):
         assert other.isObject()
         return False
 
+    def _getDependentObjects(self):
+        # NB: The codegen for an interface type depends on
+        #  a) That the identifier is in fact an interface (as opposed to
+        #     a dictionary or something else).
+        #  b) The native type of the interface.
+        #  If we depend on the interface object we will also depend on
+        #  anything the interface depends on which is undesirable.  We
+        #  considered implementing a dependency just on the interface type
+        #  file, but then every modification to an interface would cause this
+        #  to be regenerated which is still undesirable.  We decided not to
+        #  depend on anything, reasoning that:
+        #  1) Changing the concrete type of the interface requires modifying
+        #     Bindings.conf, which is still a global dependency.
+        #  2) Changing an interface to a dictionary (or vice versa) with the
+        #     same identifier should be incredibly rare.
+        return set()
+
 class IDLBuiltinType(IDLType):
 
     Types = enum(
@@ -1906,6 +1988,9 @@ class IDLBuiltinType(IDLType):
                  (self.isTypedArray() and not other.isArrayBufferView() and not
                   (other.isTypedArray() and other.name == self.name)))))
 
+    def _getDependentObjects(self):
+        return set()
+
 BuiltinTypes = {
       IDLBuiltinType.Types.byte:
           IDLBuiltinType(BuiltinLocation("<builtin type>"), "Byte",
@@ -2064,6 +2149,9 @@ class IDLValue(IDLObject):
             raise WebIDLError("Cannot coerce type %s to type %s." %
                               (self.type, type), [location])
 
+    def _getDependentObjects(self):
+        return set()
+
 class IDLNullValue(IDLObject):
     def __init__(self, location):
         IDLObject.__init__(self, location)
@@ -2081,7 +2169,10 @@ class IDLNullValue(IDLObject):
         nullValue = IDLNullValue(self.location)
         nullValue.type = type
         return nullValue
-        
+
+    def _getDependentObjects(self):
+        return set()
+  
 
 class IDLInterfaceMember(IDLObjectWithIdentifier):
 
@@ -2162,6 +2253,9 @@ class IDLConst(IDLInterfaceMember):
     def validate(self):
         pass
 
+    def _getDependentObjects(self):
+        return set([self.type, self.value])
+
 class IDLAttribute(IDLInterfaceMember):
     def __init__(self, location, identifier, type, readonly, inherit=False,
                  static=False, stringifier=False):
@@ -2307,6 +2401,9 @@ class IDLAttribute(IDLInterfaceMember):
     def isUnforgeable(self):
         return self._unforgeable
 
+    def _getDependentObjects(self):
+        return set([self.type])
+
 class IDLArgument(IDLObjectWithIdentifier):
     def __init__(self, location, identifier, type, optional=False, defaultValue=None, variadic=False, dictionaryMember=False):
         IDLObjectWithIdentifier.__init__(self, location, None, identifier)
@@ -2379,6 +2476,12 @@ class IDLArgument(IDLObjectWithIdentifier):
                                                                self.location)
             assert self.defaultValue
 
+    def _getDependentObjects(self):
+        deps = set([self.type])
+        if self.defaultValue:
+            deps.add(self.defaultValue)
+        return deps
+
 class IDLCallbackType(IDLType, IDLObjectWithScope):
     def __init__(self, location, parentScope, identifier, returnType, arguments):
         assert isinstance(returnType, IDLType)
@@ -2446,6 +2549,9 @@ class IDLCallbackType(IDLType, IDLObjectWithScope):
         if len(unhandledAttrs) != 0:
             IDLType.addExtendedAttributes(self, unhandledAttrs)
 
+    def _getDependentObjects(self):
+        return set([self._returnType] + self._arguments)
+
 class IDLMethodOverload:
     """
     A class that represents a single overload of a WebIDL method.  This is not
@@ -2461,6 +2567,11 @@ class IDLMethodOverload:
         self.arguments = list(arguments)
         self.location = location
 
+    def _getDependentObjects(self):
+        deps = set(self.arguments)
+        deps.add(self.returnType)
+        return deps
+
 class IDLMethod(IDLInterfaceMember, IDLScope):
 
     Special = enum(
@@ -2808,6 +2919,12 @@ class IDLMethod(IDLInterfaceMember, IDLScope):
                                   [attr.location, self.location])
         IDLInterfaceMember.handleExtendedAttribute(self, attr)
 
+    def _getDependentObjects(self):
+        deps = set()
+        for overload in self._overloads:
+            deps.union(overload._getDependentObjects())
+        return deps
+
 class IDLImplementsStatement(IDLObject):
     def __init__(self, location, implementor, implementee):
         IDLObject.__init__(self, location)
diff --git a/dom/bindings/parser/tests/test_nullable_equivalency.py b/dom/bindings/parser/tests/test_nullable_equivalency.py
index f36941de3ac..86e2d3b70b6 100644
--- a/dom/bindings/parser/tests/test_nullable_equivalency.py
+++ b/dom/bindings/parser/tests/test_nullable_equivalency.py
@@ -90,7 +90,7 @@ def checkEquivalent(iface, harness):
     for attr in dir(type1):
         if attr.startswith('_') or \
            attr in ['nullable', 'builtin', 'filename', 'location',
-                    'inner', 'QName'] or \
+                    'inner', 'QName', 'getDeps'] or \
            (hasattr(type(type1), attr) and not callable(getattr(type1, attr))):
             continue
 
diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in
index ddf2c89cb58..1e8b2c095b1 100644
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -44,7 +44,6 @@ bindinggen_dependencies := \
   ../Configuration.py \
   ../Codegen.py \
   ../parser/WebIDL.py \
-  ../ParserResults.pkl \
   ../Makefile \
   $(GLOBAL_DEPS) \
   $(NULL)

From 440bea3fd71d6d7fc33553b2a8aa0263cc99ff32 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 10:43:03 -0800
Subject: [PATCH 22/64] Bug 843711 - Fix up new |Components| culprits in test
 suite. r=mccr8

---
 browser/base/content/test/test_bug787619.html |  2 +-
 content/base/test/test_XHR_anon.html          |  6 ++--
 content/base/test/test_bug425013.html         |  2 +-
 content/base/test/test_bug429157.html         |  2 +-
 content/base/test/test_bug810494.html         |  2 +-
 .../test_child_process_shutdown_message.html  |  6 ++--
 .../test_messagemanager_assertpermission.html | 14 ++++-----
 .../test_webgl_conformance_test_suite.html    | 10 +++---
 content/xbl/test/test_bug397934.xhtml         |  2 +-
 .../browserElement_AppFramePermission.js      |  2 +-
 .../test/test_archivereader_nonUnicode.html   |  4 +--
 dom/indexedDB/test/helpers.js                 |  2 +-
 .../tests/test_permission_basics.html         |  3 +-
 .../tests/test_settings_onsettingchange.html  |  3 +-
 .../mochitest/webapps/file_bug_779982.js      |  2 +-
 image/test/crashtests/ownerdiscard.html       |  4 +--
 js/xpconnect/tests/mochitest/Makefile.in      |  1 -
 .../tests/mochitest/test_bug478438.html       |  2 +-
 .../tests/mochitest/test_bug553407.html       | 31 -------------------
 .../tests/mochitest/test_bug785096.html       |  4 +--
 layout/inspector/tests/test_bug462787.html    |  2 +-
 layout/inspector/tests/test_bug806192.html    |  2 +-
 .../passwordmgr/test/test_bug_654348.html     |  2 +-
 .../passwordmgr/test/test_bug_776171.html     |  2 +-
 .../test/test_notifications_popup.html        |  6 ++--
 .../passwordmgr/test/test_prompt_async.html   | 12 +++----
 .../tests/chrome/sandbox_content_perms.html   |  4 +++
 27 files changed, 48 insertions(+), 86 deletions(-)
 delete mode 100644 js/xpconnect/tests/mochitest/test_bug553407.html

diff --git a/browser/base/content/test/test_bug787619.html b/browser/base/content/test/test_bug787619.html
index b6fbbc9e15c..93d7a84aa83 100644
--- a/browser/base/content/test/test_bug787619.html
+++ b/browser/base/content/test/test_bug787619.html
@@ -18,7 +18,7 @@
   <script class="testbody" type="application/javascript;version=1.7">
   SimpleTest.waitForExplicitFinish();
 
-  const Ci = Components.interfaces;
+  const Ci = SpecialPowers.Ci;
   let wrapperClickCount = 0;
 
   function test1() {
diff --git a/content/base/test/test_XHR_anon.html b/content/base/test/test_XHR_anon.html
index e02af8619b4..71bd62e0dd1 100644
--- a/content/base/test/test_XHR_anon.html
+++ b/content/base/test/test_XHR_anon.html
@@ -24,10 +24,8 @@ let am = {
   authMgr: null,
 
   init: function() {
-    const {classes: Cc, interfaces: Ci} = SpecialPowers.wrap(Components);
-
-    this.authMgr = Cc["@mozilla.org/network/http-auth-manager;1"]
-                     .getService(Components.interfaces.nsIHttpAuthManager)
+    this.authMgr = SpecialPowers.Cc["@mozilla.org/network/http-auth-manager;1"]
+                                .getService(SpecialPowers.Ci.nsIHttpAuthManager)
   },
 
   addIdentity: function() {
diff --git a/content/base/test/test_bug425013.html b/content/base/test/test_bug425013.html
index b72b3d0d650..66af670aa93 100644
--- a/content/base/test/test_bug425013.html
+++ b/content/base/test/test_bug425013.html
@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=425013
 
 <script type="text/javascript;version=1.7">
 var missingPlugins = new Array();
-var OBJLC = Components.interfaces.nsIObjectLoadingContent;
+var OBJLC = SpecialPowers.Ci.nsIObjectLoadingContent;
 
 function pluginBinding(event)
 {
diff --git a/content/base/test/test_bug429157.html b/content/base/test/test_bug429157.html
index 9c78c510cbc..1c01eb8806f 100644
--- a/content/base/test/test_bug429157.html
+++ b/content/base/test/test_bug429157.html
@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=429157
 
 <script>
 var missingPlugins = new Array();
-const OBJLC = Components.interfaces.nsIObjectLoadingContent;
+const OBJLC = SpecialPowers.Ci.nsIObjectLoadingContent;
 
 function pluginBindingAttached(event)
 {
diff --git a/content/base/test/test_bug810494.html b/content/base/test/test_bug810494.html
index d9c2cc45be6..2aa659b80b7 100644
--- a/content/base/test/test_bug810494.html
+++ b/content/base/test/test_bug810494.html
@@ -19,7 +19,7 @@ function test(tag, type) {
   "use strict";
   info("testing " + tag + " tag with type " + type);
 
-  const OBJLC = Components.interfaces.nsIObjectLoadingContent;
+  const OBJLC = SpecialPowers.Ci.nsIObjectLoadingContent;
   let obj = document.createElement(tag);
   obj.type = type;
   document.body.appendChild(obj);
diff --git a/content/base/test/test_child_process_shutdown_message.html b/content/base/test/test_child_process_shutdown_message.html
index dfebea910c7..f4ec467540d 100644
--- a/content/base/test/test_child_process_shutdown_message.html
+++ b/content/base/test/test_child_process_shutdown_message.html
@@ -16,14 +16,12 @@
 <pre id="test">
 <script class="testbody" type="application/javascript;version=1.8">
 
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = SpecialPowers.wrap(Components);
-
 const APP_URL = "http://example.org";
 const APP_MANIFEST = "http://example.org/manifest.webapp";
 const CHILD_PROCESS_SHUTDOWN_MESSAGE = "child-process-shutdown";
 
-let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
-             .getService(Ci.nsIMessageBroadcaster);
+let ppmm = SpecialPowers.Cc["@mozilla.org/parentprocessmessagemanager;1"]
+                        .getService(SpecialPowers.Ci.nsIMessageBroadcaster);
 
 /**
  * Load the example.org site in an <iframe mozbrowser>
diff --git a/content/base/test/test_messagemanager_assertpermission.html b/content/base/test/test_messagemanager_assertpermission.html
index 5d76cf56348..816353afbe6 100644
--- a/content/base/test/test_messagemanager_assertpermission.html
+++ b/content/base/test/test_messagemanager_assertpermission.html
@@ -15,18 +15,16 @@
 <pre id="test">
 <script class="testbody" type="application/javascript;version=1.8">
 
-const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = SpecialPowers.wrap(Components);
-
 const APP_URL = "http://example.org";
 const APP_MANIFEST = "http://example.org/manifest.webapp";
 const CHILD_PROCESS_SHUTDOWN_MESSAGE = "child-process-shutdown";
 
-let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
-             .getService(Ci.nsIMessageBroadcaster);
-let cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]
-             .getService(Ci.nsISyncMessageSender);
-let gAppsService = Cc["@mozilla.org/AppsService;1"]
-                     .getService(Ci.nsIAppsService);
+let ppmm = SpecialPowers.Cc["@mozilla.org/parentprocessmessagemanager;1"]
+                        .getService(SpecialPowers.Ci.nsIMessageBroadcaster);
+let cpmm = SpecialPowers.Cc["@mozilla.org/childprocessmessagemanager;1"]
+                        .getService(SpecialPowers.Ci.nsISyncMessageSender);
+let gAppsService = SpecialPowers.Cc["@mozilla.org/AppsService;1"]
+                     .getService(SpecialPowers.Ci.nsIAppsService);
 
 function setUp() {
   SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
diff --git a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
index 05c97b04950..8e151f41b66 100644
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@@ -45,8 +45,8 @@ var OPTIONS = {
 SimpleTest.waitForExplicitFinish();
 
 function detectDriverType() {
-  const Cc = SpecialPowers.wrap(Components).classes;
-  const Ci = SpecialPowers.wrap(Components).interfaces;
+  const Cc = SpecialPowers.Cc;
+  const Ci = SpecialPowers.Ci;
   var doc = Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser).parseFromString("<html/>", "text/html");
 
   var canvas = doc.createElement("canvas");
@@ -105,15 +105,15 @@ function start() {
   if (kIsWindows) {
     // code borrowed from browser/modules/test/browser_taskbar_preview.js
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var version = Components.classes["@mozilla.org/system-info;1"]
-                            .getService(Components.interfaces.nsIPropertyBag2)
+    var version = SpecialPowers.Cc["@mozilla.org/system-info;1"]
+                            .getService(SpecialPowers.Ci.nsIPropertyBag2)
                             .getProperty("version");
     kIsWindowsVistaOrHigher = (parseFloat(version) >= 6.0);
   }
 
   function getEnv(env) {
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    var envsvc = Components.classes["@mozilla.org/process/environment;1"].getService(Components.interfaces.nsIEnvironment);
+    var envsvc = SpecialPowers.Cc["@mozilla.org/process/environment;1"].getService(SpecialPowers.Ci.nsIEnvironment);
     var val = envsvc.get(env);
     if (val == "")
       return null;
diff --git a/content/xbl/test/test_bug397934.xhtml b/content/xbl/test/test_bug397934.xhtml
index b3d3a16f6d7..7c56409d1b0 100644
--- a/content/xbl/test/test_bug397934.xhtml
+++ b/content/xbl/test/test_bug397934.xhtml
@@ -78,7 +78,7 @@ addLoadEvent(function() {
   is(d.testAncestor, "ancestor",
      "test1" + ": Empty field should not override ancestor binding");
 
-  var win = XPCNativeWrapper.unwrap(window);
+  var win = window;
   win.counter = 0;
   d.testEvalOnce;
   d.testEvalOnce;
diff --git a/dom/browser-element/mochitest/browserElement_AppFramePermission.js b/dom/browser-element/mochitest/browserElement_AppFramePermission.js
index c9ea2d65b95..e20555ad7b0 100644
--- a/dom/browser-element/mochitest/browserElement_AppFramePermission.js
+++ b/dom/browser-element/mochitest/browserElement_AppFramePermission.js
@@ -8,7 +8,7 @@ SimpleTest.waitForExplicitFinish();
 
 function makeAllAppsLaunchable() {
   var Webapps = {};
-  SpecialPowers.wrap(Components).utils.import("resource://gre/modules/Webapps.jsm", Webapps);
+  SpecialPowers.Cu.import("resource://gre/modules/Webapps.jsm", Webapps);
   var appRegistry = SpecialPowers.wrap(Webapps.DOMApplicationRegistry);
 
   var originalValue = appRegistry.allAppsLaunchable;
diff --git a/dom/file/test/test_archivereader_nonUnicode.html b/dom/file/test/test_archivereader_nonUnicode.html
index 5d9da5d22e9..56a09fd9a0e 100644
--- a/dom/file/test/test_archivereader_nonUnicode.html
+++ b/dom/file/test/test_archivereader_nonUnicode.html
@@ -11,8 +11,8 @@
 
   <script type="text/javascript;version=1.7">
   function createNonUnicodeData() {
-    const Cc = SpecialPowers.wrap(Components).classes;
-    const Ci = SpecialPowers.wrap(Components).interfaces;
+    const Cc = SpecialPowers.Cc;
+    const Ci = SpecialPowers.Ci;
 
     var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
     var testFile = dirSvc.get("ProfD", Ci.nsIFile);
diff --git a/dom/indexedDB/test/helpers.js b/dom/indexedDB/test/helpers.js
index 034f74264df..fa514b3d905 100644
--- a/dom/indexedDB/test/helpers.js
+++ b/dom/indexedDB/test/helpers.js
@@ -10,7 +10,7 @@ var archiveReaderEnabled = false;
 // and content mochitests (where the |Components| object is accessible only as
 // SpecialPowers.Components). Expose Components if necessary here to make things
 // work everywhere.
-if (typeof Components === 'undefined')
+if (typeof Components === 'undefined' && typeof SpecialPowers === 'object')
   Components = SpecialPowers.Components;
 
 function executeSoon(aFun)
diff --git a/dom/permission/tests/test_permission_basics.html b/dom/permission/tests/test_permission_basics.html
index d11ddb1afb6..92a6b817ffb 100644
--- a/dom/permission/tests/test_permission_basics.html
+++ b/dom/permission/tests/test_permission_basics.html
@@ -30,13 +30,12 @@ var testCertApp = {
 };
 
 SpecialPowers.addPermission("permissions", true, document);
-var comp = SpecialPowers.wrap(Components);
 SpecialPowers.pushPrefEnv({ "set": [["dom.mozPermissionSettings.enabled", true]] },
                           function() {
                             SpecialPowers.removePermission("permissions", document);
                           });
 
-comp.utils.import("resource://gre/modules/PermissionSettings.jsm");
+SpecialPowers.Cu.import("resource://gre/modules/PermissionSettings.jsm");
 var mozPermissions = window.navigator.mozPermissionSettings;
 
 function permissionTest() {
diff --git a/dom/settings/tests/test_settings_onsettingchange.html b/dom/settings/tests/test_settings_onsettingchange.html
index 6460320c16b..f7244de7cb3 100644
--- a/dom/settings/tests/test_settings_onsettingchange.html
+++ b/dom/settings/tests/test_settings_onsettingchange.html
@@ -21,8 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={678695}
 
 "use strict";
 
-var comp = SpecialPowers.wrap(Components);
-comp.utils.import("resource://gre/modules/SettingsChangeNotifier.jsm");
+SpecialPowers.Cu.import("resource://gre/modules/SettingsChangeNotifier.jsm");
 SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
 SpecialPowers.addPermission("settings-write", true, document);
 SpecialPowers.addPermission("settings-read", true, document);
diff --git a/dom/tests/mochitest/webapps/file_bug_779982.js b/dom/tests/mochitest/webapps/file_bug_779982.js
index cef1fa57fc5..d9a31acc23a 100644
--- a/dom/tests/mochitest/webapps/file_bug_779982.js
+++ b/dom/tests/mochitest/webapps/file_bug_779982.js
@@ -1,6 +1,6 @@
 function makeAllAppsLaunchable() {
   var Webapps = {};
-  SpecialPowers.wrap(Components).utils.import("resource://gre/modules/Webapps.jsm", Webapps);
+  SpecialPowers.Cu.import("resource://gre/modules/Webapps.jsm", Webapps);
   var appRegistry = SpecialPowers.wrap(Webapps.DOMApplicationRegistry);
 
   var originalValue = appRegistry.allAppsLaunchable;
diff --git a/image/test/crashtests/ownerdiscard.html b/image/test/crashtests/ownerdiscard.html
index 62e33828bb0..51f51370d01 100644
--- a/image/test/crashtests/ownerdiscard.html
+++ b/image/test/crashtests/ownerdiscard.html
@@ -6,8 +6,8 @@
     <iframe src=discardframe.htm></iframe>
   </div>
   <script>
-    const Ci = Components.interfaces;
-    const Cc = SpecialPowers.wrap(Components).classes;
+    const Ci = SpecialPowers.Ci;
+    const Cc = SpecialPowers.Cc;
 
     function ImageDecoderObserverStub()
     {
diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in
index 3a4e01ec06d..dffce2028f6 100644
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -43,7 +43,6 @@ MOCHITEST_FILES =	chrome_wrappers_helper.html \
 		bug504877_helper.html \
 		test_bug505915.html \
 		file_bug505915.html \
-		test_bug553407.html \
 		test_bug560351.html \
 		bug571849_helper.html \
 		test_bug585745.html \
diff --git a/js/xpconnect/tests/mochitest/test_bug478438.html b/js/xpconnect/tests/mochitest/test_bug478438.html
index 00bc39d14a5..2fd01ba4fe0 100644
--- a/js/xpconnect/tests/mochitest/test_bug478438.html
+++ b/js/xpconnect/tests/mochitest/test_bug478438.html
@@ -17,7 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478438
         return;
       test.calledAlready = true;
 
-      var iwin = (new XPCNativeWrapper(document)).getElementById("f").contentWindow;
+      var iwin = document.getElementById("f").contentWindow;
 
       function testOne(fn, onAllow, infinitive) {
         try { fn(); onAllow("able " + infinitive, "") }
diff --git a/js/xpconnect/tests/mochitest/test_bug553407.html b/js/xpconnect/tests/mochitest/test_bug553407.html
deleted file mode 100644
index c01d2e348c2..00000000000
--- a/js/xpconnect/tests/mochitest/test_bug553407.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=517163
--->
-<head>
-  <title>Test for Bug 553407</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=553407">Mozilla Bug 553407</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 553407 **/
-is(typeof new XPCNativeWrapper(location), "object", "XPCNativeWrapper(location) is an object")
-is(typeof new XPCNativeWrapper(XMLHttpRequest), "function", "XPCNativeWrapper(XMLHttpRequest) is a function")
-// We no longer support .wrappedJSObject on NW since for same-origin there is no wrapper in between.
-// is(typeof new XPCNativeWrapper(location).wrappedJSObject, "object", "XPCNativeWrapper(location).wrappedJSObject is an object")
-// is(typeof new XPCNativeWrapper(XMLHttpRequest).wrappedJSObject, "function", "XPCNativeWrapper(XMLHttpRequest).wrappedJSObject is a function")
-ok("a".replace("a", new XPCNativeWrapper(location)).indexOf("mochi.test") >= 0, "XPCNativeWrappers can be used as the replacement value for .replace");
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/js/xpconnect/tests/mochitest/test_bug785096.html b/js/xpconnect/tests/mochitest/test_bug785096.html
index 84d5b6503c2..49a44a2edeb 100644
--- a/js/xpconnect/tests/mochitest/test_bug785096.html
+++ b/js/xpconnect/tests/mochitest/test_bug785096.html
@@ -24,10 +24,10 @@ function test()
   option.text="Fubar";
   sel.options.add(option);
   try {
-    Components.lookupMethod(sel.options, "add")(option);
+    SpecialPowers.Components.lookupMethod(sel.options, "add")(option);
     ok(true, "function call should not throw")
   } catch(e) {
-    do_throw("this call should just work without any exceptions");
+    ok(false, "this call should just work without any exceptions");
   }
   SimpleTest.finish();
 }
diff --git a/layout/inspector/tests/test_bug462787.html b/layout/inspector/tests/test_bug462787.html
index 0e4ac006283..84932c66438 100644
--- a/layout/inspector/tests/test_bug462787.html
+++ b/layout/inspector/tests/test_bug462787.html
@@ -23,7 +23,7 @@ function do_test() {
   const INVALID_POINTER = 0x80004003;
 
   var utils = SpecialPowers.Cc["@mozilla.org/inspector/dom-utils;1"]
-                             .getService(Components.interfaces.inIDOMUtils);
+                             .getService(SpecialPowers.Ci.inIDOMUtils);
   try {
     utils.getCSSStyleRules(null); 
     ok(false, "expected an exception"); 
diff --git a/layout/inspector/tests/test_bug806192.html b/layout/inspector/tests/test_bug806192.html
index 263fab9887a..2a19ab6334f 100644
--- a/layout/inspector/tests/test_bug806192.html
+++ b/layout/inspector/tests/test_bug806192.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=806192
 <script type="application/javascript">
 
 const utils = SpecialPowers.Cc["@mozilla.org/inspector/dom-utils;1"]
-.getService(Components.interfaces.inIDOMUtils);
+.getService(SpecialPowers.Ci.inIDOMUtils);
 
 try {
     var res = utils.getBindingURLs({});
diff --git a/toolkit/components/passwordmgr/test/test_bug_654348.html b/toolkit/components/passwordmgr/test/test_bug_654348.html
index 4604b0512e4..51bf7a1d37f 100644
--- a/toolkit/components/passwordmgr/test/test_bug_654348.html
+++ b/toolkit/components/passwordmgr/test/test_bug_654348.html
@@ -26,7 +26,7 @@ SimpleTest.waitForExplicitFinish();
 function clearAuthCache()
 {
   var authMgr = SpecialPowers.Cc['@mozilla.org/network/http-auth-manager;1']
-                             .getService(Components.interfaces.nsIHttpAuthManager);
+                             .getService(SpecialPowers.Ci.nsIHttpAuthManager);
   authMgr.clearAll();
 }
 
diff --git a/toolkit/components/passwordmgr/test/test_bug_776171.html b/toolkit/components/passwordmgr/test/test_bug_776171.html
index 72d59ee7d49..435161ef325 100644
--- a/toolkit/components/passwordmgr/test/test_bug_776171.html
+++ b/toolkit/components/passwordmgr/test/test_bug_776171.html
@@ -28,7 +28,7 @@ SimpleTest.waitForExplicitFinish();
 function clearAuthCache()
 {
   var authMgr = SpecialPowers.Cc['@mozilla.org/network/http-auth-manager;1']
-                             .getService(Components.interfaces.nsIHttpAuthManager);
+                             .getService(SpecialPowers.Ci.nsIHttpAuthManager);
   authMgr.clearAll();
 }
 
diff --git a/toolkit/components/passwordmgr/test/test_notifications_popup.html b/toolkit/components/passwordmgr/test/test_notifications_popup.html
index 39175edce70..6dcfe6d67ad 100644
--- a/toolkit/components/passwordmgr/test/test_notifications_popup.html
+++ b/toolkit/components/passwordmgr/test/test_notifications_popup.html
@@ -163,8 +163,8 @@ function checkTest() {
     }
 }
 
-const Ci = Components.interfaces;
-const Cc = SpecialPowers.wrap(Components).classes;
+const Ci = SpecialPowers.Ci;
+const Cc = SpecialPowers.Cc;
 ok(Ci != null, "Access Ci");
 ok(Cc != null, "Access Cc");
 
@@ -174,7 +174,7 @@ ok(pwmgr != null, "Access pwmgr");
 
 pwmgr.removeAllLogins();
 
-var nsLoginInfo = new SpecialPowers.wrap(Components).
+var nsLoginInfo = new SpecialPowers.wrap(SpecialPowers.Components).
                       Constructor("@mozilla.org/login-manager/loginInfo;1",
                                   Ci.nsILoginInfo, "init");
 var login1 = new nsLoginInfo("http://mochi.test:8888", "http://mochi.test:8888", null,
diff --git a/toolkit/components/passwordmgr/test/test_prompt_async.html b/toolkit/components/passwordmgr/test/test_prompt_async.html
index 716476289bb..061aa77ae25 100644
--- a/toolkit/components/passwordmgr/test/test_prompt_async.html
+++ b/toolkit/components/passwordmgr/test/test_prompt_async.html
@@ -33,7 +33,7 @@
                 const interfaces = [Ci.nsIObserver, Ci.nsISupports];
 
                 if (!interfaces.some( function(v) { return iid.equals(v) } ))
-                        throw SpecialPowers.Components.results.NS_ERROR_NO_INTERFACE;
+                        throw SpecialPowers.Cr.NS_ERROR_NO_INTERFACE;
                 return this;
             },
 
@@ -125,7 +125,7 @@
 	const interfaces = [Ci.nsIProtocolProxyCallback, Ci.nsISupports];
 
         if (!interfaces.some( function(v) { return iid.equals(v) } ))
-          throw Components.results.NS_ERROR_NO_INTERFACE;
+          throw SpecialPowers.Cr.NS_ERROR_NO_INTERFACE;
 	  return this;
 	},
 
@@ -137,12 +137,10 @@
 
 	function startup() {
             //need to allow for arbitrary network servers defined in PAC instead of a hardcoded moz-proxy.
-            var ios = SpecialPowers.wrap(Components)
-                                   .classes["@mozilla.org/network/io-service;1"]
-                                   .getService(Components.interfaces.nsIIOService);
+            var ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"]
+                                   .getService(SpecialPowers.Ci.nsIIOService);
 
-            var pps = SpecialPowers.wrap(Components)
-                                   .classes["@mozilla.org/network/protocol-proxy-service;1"]
+            var pps = SpecialPowers.Cc["@mozilla.org/network/protocol-proxy-service;1"]
                                    .getService();
 
             var uri = ios.newURI("http://example.com", null, null);
diff --git a/toolkit/identity/tests/chrome/sandbox_content_perms.html b/toolkit/identity/tests/chrome/sandbox_content_perms.html
index 59905f13c24..2ebb94b880d 100644
--- a/toolkit/identity/tests/chrome/sandbox_content_perms.html
+++ b/toolkit/identity/tests/chrome/sandbox_content_perms.html
@@ -19,6 +19,10 @@
       }
 
       function CcDenied() {
+        // Once Components goes away in content, the question of whether or not
+        // Components.classes throws is not well-formed.
+        if (typeof Components === 'undefined')
+          return true;
         try {
           Components.classes;
           return false;

From f4e67163307570b85717b279fa26210287ceb184 Mon Sep 17 00:00:00 2001
From: William Chen <wchen@mozilla.com>
Date: Mon, 25 Feb 2013 09:20:49 -0800
Subject: [PATCH 23/64] Bug 837352 - Don't generate dictionary code in WebIDL
 unless used in generated code. r=bz

---
 dom/bindings/Configuration.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dom/bindings/Configuration.py b/dom/bindings/Configuration.py
index d69f4b5613d..db4defdad5c 100644
--- a/dom/bindings/Configuration.py
+++ b/dom/bindings/Configuration.py
@@ -65,12 +65,14 @@ class Configuration:
         # Figure out what our main-thread and worker dictionaries and callbacks
         # are.
         mainTypes = set()
-        for descriptor in self.getDescriptors(workers=False, isExternal=False):
+        for descriptor in ([self.getDescriptor("DummyInterface", workers=False)] +
+                           self.getDescriptors(workers=False, isExternal=False, skipGen=False)):
             mainTypes |= set(getFlatTypes(getTypesFromDescriptor(descriptor)))
         (mainCallbacks, mainDictionaries) = findCallbacksAndDictionaries(mainTypes)
 
         workerTypes = set();
-        for descriptor in self.getDescriptors(workers=True, isExternal=False):
+        for descriptor in ([self.getDescriptor("DummyInterfaceWorkers", workers=True)] +
+                           self.getDescriptors(workers=True, isExternal=False, skipGen=False)):
             workerTypes |= set(getFlatTypes(getTypesFromDescriptor(descriptor)))
         (workerCallbacks, workerDictionaries) = findCallbacksAndDictionaries(workerTypes)
 

From 59f76077818ae17254a5c6626fb89b267c3cbfec Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Fri, 22 Feb 2013 14:18:38 -0800
Subject: [PATCH 24/64] Bug 831367 - Simplify
 SpecialPowersAPI.bindDOMWindowUtils(), r=ted

---
 dom/contacts/tests/test_contacts_blobs.html   |  2 +-
 dom/file/test/helpers.js                      |  4 +-
 dom/indexedDB/test/file.js                    |  4 +-
 .../general/test_domWindowUtils.html          |  3 +-
 .../specialpowers/content/specialpowersAPI.js | 40 ++-----------------
 5 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/dom/contacts/tests/test_contacts_blobs.html b/dom/contacts/tests/test_contacts_blobs.html
index ced5a2e5094..3031d48785c 100644
--- a/dom/contacts/tests/test_contacts_blobs.html
+++ b/dom/contacts/tests/test_contacts_blobs.html
@@ -54,7 +54,7 @@ function getRandomView(size)
 
 function getBlob(type, view)
 {
-  return utils.getBlob([view], {type: type});
+  return SpecialPowers.unwrap(utils.getBlob([view], {type: type}));
 }
 
 function getRandomBlob(size)
diff --git a/dom/file/test/helpers.js b/dom/file/test/helpers.js
index b1c0d690ab0..64b70f2a568 100644
--- a/dom/file/test/helpers.js
+++ b/dom/file/test/helpers.js
@@ -179,7 +179,7 @@ function compareBuffers(buffer1, buffer2)
 
 function getBlob(type, buffer)
 {
-  return utils.getBlob([buffer], {type: type});
+  return SpecialPowers.unwrap(utils.getBlob([buffer], {type: type}));
 }
 
 function getRandomBlob(size)
@@ -189,5 +189,5 @@ function getRandomBlob(size)
 
 function getFileId(blob)
 {
-  return utils.getFileId(blob);
+  return SpecialPowers.unwrap(utils.getFileId(blob));
 }
diff --git a/dom/indexedDB/test/file.js b/dom/indexedDB/test/file.js
index 3c6194a1327..e254a3cbd03 100644
--- a/dom/indexedDB/test/file.js
+++ b/dom/indexedDB/test/file.js
@@ -49,12 +49,12 @@ function compareBuffers(buffer1, buffer2)
 
 function getBlob(type, view)
 {
-  return utils.getBlob([view], {type: type});
+  return SpecialPowers.unwrap(utils.getBlob([view], {type: type}));
 }
 
 function getFile(name, type, view)
 {
-  return utils.getFile(name, [view], {type: type});
+  return SpecialPowers.unwrap(utils.getFile(name, [view], {type: type}));
 }
 
 function getRandomBlob(size)
diff --git a/dom/tests/mochitest/general/test_domWindowUtils.html b/dom/tests/mochitest/general/test_domWindowUtils.html
index 974560ff874..141fd285d60 100644
--- a/dom/tests/mochitest/general/test_domWindowUtils.html
+++ b/dom/tests/mochitest/general/test_domWindowUtils.html
@@ -85,7 +85,8 @@ function testElementFromPoint() {
       moveEl.style.left = moveX + "px";
       moveEl.style.top = moveY + "px";
     }
-    let found = domWindowUtils.elementFromPoint(x, y, ignoreScroll, flushLayout);
+    let found = SpecialPowers.unwrap(domWindowUtils.elementFromPoint(
+                                     x, y, ignoreScroll, flushLayout));
     is(found, expected, "at index " + i + " for data " + testData[i][0].toSource());
   }
 
diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js
index 09f72dedc54..ff4ce079e02 100644
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -32,43 +32,9 @@ function bindDOMWindowUtils(aWindow) {
   if (!aWindow)
     return
 
-  var util = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                   .getInterface(Components.interfaces.nsIDOMWindowUtils);
-  // This bit of magic brought to you by the letters
-  // B Z, and E, S and the number 5.
-  //
-  // Take all of the properties on the nsIDOMWindowUtils-implementing
-  // object, and rebind them onto a new object with a stub that uses
-  // apply to call them from this privileged scope. This way we don't
-  // have to explicitly stub out new methods that appear on
-  // nsIDOMWindowUtils.
-  //
-  // Note that this will be a chrome object that is (possibly) exposed to
-  // content. Make sure to define __exposedProps__ for each property to make
-  // sure that it gets through the security membrane.
-  var proto = Object.getPrototypeOf(util);
-  var target = { __exposedProps__: {} };
-  function rebind(desc, prop) {
-    if (prop in desc && typeof(desc[prop]) == "function") {
-      var oldval = desc[prop];
-      try {
-        desc[prop] = function() {
-          return oldval.apply(util, arguments);
-        };
-      } catch (ex) {
-        dump("WARNING: Special Powers failed to rebind function: " + desc + "::" + prop + "\n");
-      }
-    }
-  }
-  for (var i in proto) {
-    var desc = Object.getOwnPropertyDescriptor(proto, i);
-    rebind(desc, "get");
-    rebind(desc, "set");
-    rebind(desc, "value");
-    Object.defineProperty(target, i, desc);
-    target.__exposedProps__[i] = 'rw';
-  }
-  return target;
+   var util = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                     .getInterface(Ci.nsIDOMWindowUtils);
+   return wrapPrivileged(util);
 }
 
 function getRawComponents(aWindow) {

From aa021877435e9aeca99a5936ea246e9e8c250801 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Tue, 19 Feb 2013 10:05:58 +0200
Subject: [PATCH 25/64] Bug 831367 - Ensure new globals and chrome scripts will
 be generated on time in browser_dbg_chrome-debugging.js, r=ted

---
 .../devtools/debugger/test/browser_dbg_chrome-debugging.js   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js b/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js
index faf3d351224..41a6ba160e6 100644
--- a/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js
+++ b/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js
@@ -8,6 +8,7 @@
 
 var gClient = null;
 var gTab = null;
+var gHomeTab = null;
 var gThreadClient = null;
 var gNewGlobal = false;
 var gAttached = false;
@@ -33,8 +34,7 @@ function test()
           gAttached = true;
 
           // Ensure that a new global will be created.
-          let frame = content.document.createElement("iframe");
-          content.document.querySelector("body").appendChild(frame);
+          gHomeTab = gBrowser.addTab("about:home");
 
           finish_test();
         });
@@ -58,6 +58,7 @@ function finish_test()
   }
   gClient.removeListener("newScript", onNewScript);
   gThreadClient.resume(function(aResponse) {
+    removeTab(gHomeTab);
     removeTab(gTab);
     gClient.close(function() {
       ok(gNewGlobal, "Received newGlobal event.");

From 5c3860fdeff1bd93e879e0f51120a9b8c23e5b4c Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 25 Feb 2013 11:08:25 -0800
Subject: [PATCH 26/64] Bug 844328 - Silence debug warning about _onTouchStart
 return value [r=jimm]

---
 browser/metro/base/content/input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/metro/base/content/input.js b/browser/metro/base/content/input.js
index 51e45927b80..0f0c1c55a20 100644
--- a/browser/metro/base/content/input.js
+++ b/browser/metro/base/content/input.js
@@ -219,7 +219,7 @@ var TouchModule = {
     this._targetScrollInterface = targetScrollInterface;
 
     if (!this._targetScrollbox) {
-      return false;
+      return;
     }
 
     // XXX shouldn't dragger always be valid here?

From 71539c9030b1a0fe7c01ac3503ddc632abf6fcff Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 25 Feb 2013 11:08:33 -0800
Subject: [PATCH 27/64] Bug 840360 - Extract reftest-content.js's setTimeout
 implementation into new Timer.jsm [r=jwalker r=cjones sr=gavin]

--HG--
rename : browser/devtools/shared/Browser.jsm => toolkit/modules/Timer.jsm
rename : browser/devtools/shared/test/browser_browser_basic.js => toolkit/modules/tests/xpcshell/test_timer.js
---
 browser/devtools/shared/Browser.jsm           | 74 ++-----------------
 .../shared/test/browser_browser_basic.js      | 11 ---
 layout/tools/reftest/reftest-content.js       | 37 +---------
 toolkit/modules/Makefile.in                   |  1 +
 toolkit/modules/Timer.jsm                     | 41 ++++++++++
 toolkit/modules/tests/xpcshell/test_timer.js  | 28 +++++++
 toolkit/modules/tests/xpcshell/xpcshell.ini   |  1 +
 7 files changed, 79 insertions(+), 114 deletions(-)
 create mode 100644 toolkit/modules/Timer.jsm
 create mode 100644 toolkit/modules/tests/xpcshell/test_timer.js

diff --git a/browser/devtools/shared/Browser.jsm b/browser/devtools/shared/Browser.jsm
index 8ae927c2b03..49e0a194728 100644
--- a/browser/devtools/shared/Browser.jsm
+++ b/browser/devtools/shared/Browser.jsm
@@ -20,73 +20,9 @@ this.EXPORTED_SYMBOLS = [ "Node", "HTMLElement", "setTimeout", "clearTimeout" ];
 this.Node = Components.interfaces.nsIDOMNode;
 this.HTMLElement = Components.interfaces.nsIDOMHTMLElement;
 
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-/**
- * The next value to be returned by setTimeout
+/*
+ * Import and re-export the timeout functions from Timer.jsm.
  */
-let nextID = 1;
-
-/**
- * The map of outstanding timeouts
- */
-const timers = {};
-
-/**
- * Object to be passed to Timer.initWithCallback()
- */
-function TimerCallback(callback) {
-  this._callback = callback;
-  const interfaces = [ Components.interfaces.nsITimerCallback ];
-  this.QueryInterface = XPCOMUtils.generateQI(interfaces);
-}
-
-TimerCallback.prototype.notify = function(timer) {
-  try {
-    for (let timerID in timers) {
-      if (timers[timerID] === timer) {
-        delete timers[timerID];
-        break;
-      }
-    }
-    this._callback.apply(null, []);
-  }
-  catch (ex) {
-    dump(ex +  '\n');
-  }
-};
-
-/**
- * Executes a code snippet or a function after specified delay.
- * This is designed to have the same interface contract as the browser
- * function.
- * @param callback is the function you want to execute after the delay.
- * @param delay is the number of milliseconds that the function call should
- * be delayed by. Note that the actual delay may be longer, see Notes below.
- * @return the ID of the timeout, which can be used later with
- * window.clearTimeout.
- */
-this.setTimeout = function setTimeout(callback, delay) {
-  const timer = Components.classes["@mozilla.org/timer;1"]
-                        .createInstance(Components.interfaces.nsITimer);
-
-  let timerID = nextID++;
-  timers[timerID] = timer;
-
-  timer.initWithCallback(new TimerCallback(callback), delay, timer.TYPE_ONE_SHOT);
-  return timerID;
-};
-
-/**
- * Clears the delay set by window.setTimeout() and prevents the callback from
- * being executed (if it hasn't been executed already)
- * @param timerID the ID of the timeout you wish to clear, as returned by
- * window.setTimeout().
- */
-this.clearTimeout = function clearTimeout(timerID) {
-  let timer = timers[timerID];
-  if (timer) {
-    timer.cancel();
-    delete timers[timerID];
-  }
-};
+let Timer = Components.utils.import("resource://gre/modules/Timer.jsm", {});
+this.setTimeout = Timer.setTimeout;
+this.clearTimeout = Timer.clearTimeout;
diff --git a/browser/devtools/shared/test/browser_browser_basic.js b/browser/devtools/shared/test/browser_browser_basic.js
index 4276672055c..d704dc639f6 100644
--- a/browser/devtools/shared/test/browser_browser_basic.js
+++ b/browser/devtools/shared/test/browser_browser_basic.js
@@ -19,19 +19,8 @@ function test() {
 }
 
 function runTest(browser, tab, document) {
-  let timeout = imported.setTimeout(shouldNotBeCalled, 100);
-  imported.clearTimeout(timeout);
-
   var p = document.getElementById("id");
 
   ok(p instanceof imported.Node, "Node correctly defined");
   ok(p instanceof imported.HTMLElement, "HTMLElement correctly defined");
-
-  let timeout = imported.setTimeout(function() {
-    finish();
-  }, 100);
-}
-
-function shouldNotBeCalled() {
-  ok(false, "Timeout cleared");
 }
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index 3e78eddc6c7..014dfcc1b1a 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -7,40 +7,7 @@
 const CC = Components.classes;
 const CI = Components.interfaces;
 const CR = Components.results;
-
-/**
- * FIXME/bug 622224: work around lack of reliable setTimeout available
- * to frame scripts.
- */
-// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4
-// days.  Should be fine as a temporary workaround.
-var gNextTimeoutId = 0;
-var gTimeoutTable = { };        // int -> nsITimer
-
-function setTimeout(callbackFn, delayMs) {
-    var id = gNextTimeoutId++;
-    var timer = CC["@mozilla.org/timer;1"].createInstance(CI.nsITimer);
-    timer.initWithCallback({
-        notify: function notify_callback() {
-                    clearTimeout(id);
-                    callbackFn();
-                }
-        },
-        delayMs,
-        timer.TYPE_ONE_SHOT);
-
-    gTimeoutTable[id] = timer;
-
-    return id;
-}
-
-function clearTimeout(id) {
-    var timer = gTimeoutTable[id];
-    if (timer) {
-        timer.cancel();
-        delete gTimeoutTable[id];
-    }
-}
+const CU = Components.utils;
 
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 
@@ -50,6 +17,8 @@ const PRINTSETTINGS_CONTRACTID = "@mozilla.org/gfx/printsettings-service;1";
 // "<!--CLEAR-->"
 const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
+CU.import("resource://gre/modules/Timer.jsm");
+
 var gBrowserIsRemote;
 var gHaveCanvasSnapshot = false;
 // Plugin layers can be updated asynchronously, so to make sure that all
diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in
index 4f434134570..60554c16423 100644
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -15,6 +15,7 @@ EXTRA_JS_MODULES := \
   NewTabUtils.jsm \
   Sqlite.jsm \
   TelemetryTimestamps.jsm \
+  Timer.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/modules/Timer.jsm b/toolkit/modules/Timer.jsm
new file mode 100644
index 00000000000..fcca537f2f2
--- /dev/null
+++ b/toolkit/modules/Timer.jsm
@@ -0,0 +1,41 @@
+/* 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/. */
+
+"use strict";
+
+/**
+ * JS module implementation of nsIDOMJSWindow.setTimeout and clearTimeout.
+ */
+
+this.EXPORTED_SYMBOLS = ["setTimeout", "clearTimeout"];
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
+let gNextTimeoutId = 1; // setTimeout must return a positive integer
+
+let gTimeoutTable = new Map(); // int -> nsITimer
+
+function setTimeout(aCallback, aMilliseconds) {
+  let id = gNextTimeoutId++;
+  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer.initWithCallback(function setTimeout_timer() {
+    gTimeoutTable.delete(id);
+    aCallback();
+  }, aMilliseconds, timer.TYPE_ONE_SHOT);
+
+  gTimeoutTable.set(id, timer);
+  return id;
+}
+
+function clearTimeout(aId) {
+  if (gTimeoutTable.has(aId)) {
+    gTimeoutTable.get(aId).cancel();
+    gTimeoutTable.delete(aId);
+  }
+}
diff --git a/toolkit/modules/tests/xpcshell/test_timer.js b/toolkit/modules/tests/xpcshell/test_timer.js
new file mode 100644
index 00000000000..57981bc7585
--- /dev/null
+++ b/toolkit/modules/tests/xpcshell/test_timer.js
@@ -0,0 +1,28 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests exports from Timer.jsm
+
+let imported = {};
+Components.utils.import("resource://gre/modules/Timer.jsm", imported);
+
+function run_test(browser, tab, document) {
+  do_test_pending();
+
+  let timeout1 = imported.setTimeout(function() do_throw("Should not be called"), 100);
+  do_check_eq(typeof timeout1, "number", "setTimeout returns a number");
+  do_check_true(timeout1 > 0, "setTimeout returns a positive number");
+
+  let timeout2 = imported.setTimeout(function() {
+    do_check_true(true, "Should be called");
+    do_test_finished();
+  }, 100);
+
+  do_check_eq(typeof timeout2, "number", "setTimeout returns a number");
+  do_check_true(timeout2 > 0, "setTimeout returns a positive number");
+  do_check_neq(timeout1, timeout2, "Calling setTimeout again returns a different value");
+
+  imported.clearTimeout(timeout1);
+}
diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini
index 1255e7d635e..de3b2dcac6e 100644
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -5,3 +5,4 @@ tail =
 [test_newtab-migrate-v1.js]
 [test_sqlite.js]
 [test_TelemetryTimestamps.js]
+[test_timer.js]

From ca72525bef91cb55e72aa4c6ebd10dd415842238 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Mon, 25 Feb 2013 14:34:55 -0500
Subject: [PATCH 28/64] Bug 843747 - Disable handful of b2g emulator mochitests
 that fail with an ubuntu vm as host, r=jgriffin * * * Bug 843747 - Disable
 dom/encoding/test/test_stringencoding.html for timeout on Ubuntu VM * * * Bug
 843747 - disable mochitests that fail on Ubuntu 64 vm

---
 testing/mochitest/b2g.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json
index 8238d065b30..50391ae7652 100644
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -32,6 +32,7 @@
     "dom/devicestorage/test/test_stat.html":" /tests/dom/devicestorage/test/test_enumerate.html finished in a non-clean fashion, probably because it didn't call SimpleTest.finish()",
     "dom/devicestorage/test/test_watch.html":" /tests/dom/devicestorage/test/test_enumerate.html finished in a non-clean fashion, probably because it didn't call SimpleTest.finish()",
     "dom/devicestorage/test/test_watchOther.html":" addError was called : SecurityError",
+    "dom/encoding/test/test_stringencoding.html":" Test timed out.",
     "dom/file/test/test_append_read_data.html":" uncaught exception - UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126",
     "dom/file/test/test_archivereader.html":" uncaught exception - NS_ERROR_FAILURE: Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIProperties.get] at chrome://specialpowers/content/specialpowersAPI.js:120",
     "dom/file/test/test_archivereader_nonUnicode.html":" uncaught exception - NS_ERROR_FAILURE: Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIProperties.get] at chrome://specialpowers/content/specialpowersAPI.js:120",
@@ -52,6 +53,11 @@
     "dom/imptests/editing/conformancetest/test_event.html":" Command fontName, value \"serif\": input event, canceled; assert_equals: number of input events fired expected 0 but got 1",
     "dom/imptests/editing/conformancetest/test_runtest.html":" Test timed out.",
     "dom/imptests/editing/selecttest/test_Document-open.html":" Test runner timed us out.",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-cloneContents.html":" Resulting DOM for range 0 [paras[0].firstChild, 0, paras[0].firstChild, 0]",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-deleteContents.html":" Resulting DOM for range 0 [paras[0].firstChild, 0, paras[0].firstChild, 0]",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-extractContents.html":" Resulting DOM for range 0 [paras[0].firstChild, 0, paras[0].firstChild, 0]",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-insertNode.html":" Test timed out.",
+    "dom/imptests/webapps/DOMCore/tests/approved/test_Range-surroundContents.html":" Test timed out.",
     "dom/indexedDB/": "",
 
     "dom/sms": "",
@@ -61,6 +67,7 @@
     "dom/permission/tests/test_permission_basics.html":" uncaught exception - NS_ERROR_XPC_GS_RETURNED_FAILURE: Component returned failure code: 0x80570016 (NS_ERROR_XPC_GS_RETURNED_FAILURE) [nsIJSCID.getService] at resource://gre/modules/XPCOMUtils.jsm:202",
     "dom/settings/tests/test_settings_basics.html":" uncaught exception - NS_ERROR_XPC_GS_RETURNED_FAILURE: Component returned failure code: 0x80570016 (NS_ERROR_XPC_GS_RETURNED_FAILURE) [nsIJSCID.getService] at resource://gre/modules/XPCOMUtils.jsm:202",
     "dom/settings/tests/test_settings_onsettingchange.html":" uncaught exception - NS_ERROR_XPC_GS_RETURNED_FAILURE: Component returned failure code: 0x80570016 (NS_ERROR_XPC_GS_RETURNED_FAILURE) [nsIJSCID.getService] at resource://gre/modules/XPCOMUtils.jsm:202",
+    "dom/tests/mochitest/ajax/jquery/test_jQuery.html":" Test timed out.",
     "dom/tests/mochitest/ajax/offline/test_badManifestMagic.html":" uncaught exception - NS_ERROR_NOT_AVAILABLE: Component returned failure code: 0x80040111 (NS_ERROR_NOT_AVAILABLE) [nsIPermissionManager.addFromPrincipal] at http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/offlineTests.js:114",
     "dom/tests/mochitest/ajax/offline/test_badManifestMime.html":" uncaught exception - NS_ERROR_NOT_AVAILABLE: Component returned failure code: 0x80040111 (NS_ERROR_NOT_AVAILABLE) [nsIPermissionManager.addFromPrincipal] at http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/offlineTests.js:114",
     "dom/tests/mochitest/ajax/offline/test_bug445544.html":" uncaught exception - NS_ERROR_NOT_AVAILABLE: Component returned failure code: 0x80040111 (NS_ERROR_NOT_AVAILABLE) [nsIPermissionManager.addFromPrincipal] at http://mochi.test:8888/tests/dom/tests/mochitest/ajax/offline/offlineTests.js:114",

From 081f24dc815eff5c7beb6dfff74171fdb3431ddd Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 25 Feb 2013 14:40:44 -0500
Subject: [PATCH 29/64] Bug 842946 - When there is no selected tab, don't try
 to apply viewport updates. r=mfinkle

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

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 422197efafd..724870b518d 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -567,7 +567,7 @@ var BrowserApp = {
 
     let tab = this.selectedTab;
     if (!tab)
-      return true;
+      return false;
     return tab.contentDocumentIsDisplayed;
   },
 

From 238a276b2b1702cedfc4b13655b24c7d3428a2eb Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 25 Feb 2013 14:42:06 -0500
Subject: [PATCH 30/64] Bug 844930 - Make deprecation warning more useful.
 r=bnicholson

---
 mobile/android/base/util/EventDispatcher.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/util/EventDispatcher.java b/mobile/android/base/util/EventDispatcher.java
index 629904acf12..ed7538e4624 100644
--- a/mobile/android/base/util/EventDispatcher.java
+++ b/mobile/android/base/util/EventDispatcher.java
@@ -13,7 +13,7 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public final class EventDispatcher {
-    private static final String LOGTAG = "EventDispatcher";
+    private static final String LOGTAG = "GeckoEventDispatcher";
 
     private final Map<String, CopyOnWriteArrayList<GeckoEventListener>> mEventListeners
                   = new HashMap<String, CopyOnWriteArrayList<GeckoEventListener>>();
@@ -56,8 +56,8 @@ public final class EventDispatcher {
         try {
             JSONObject json = new JSONObject(message);
             if (json.has("gecko")) {
-                Log.w(LOGTAG, "The 'gecko' property of the sendMessageToJava parameter is deprecated.");
                 json = json.getJSONObject("gecko");
+                Log.w(LOGTAG, "The 'gecko' property of the sendMessageToJava parameter is deprecated; message of type " + json.getString("type"));
             }
             String type = json.getString("type");
 

From 3bc727855ec22321036783715654d7efc76da012 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Mon, 25 Feb 2013 19:56:04 +0000
Subject: [PATCH 31/64] Bug 844588 - Set correct min-version for clone method
 in TwoWayView (r=mfinkle)

---
 mobile/android/base/widget/TwoWayView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/widget/TwoWayView.java b/mobile/android/base/widget/TwoWayView.java
index 3dacbb123d1..3c3a094b031 100644
--- a/mobile/android/base/widget/TwoWayView.java
+++ b/mobile/android/base/widget/TwoWayView.java
@@ -3784,7 +3784,7 @@ public class TwoWayView extends AdapterView<ListAdapter> implements
         }
     }
 
-    @TargetApi(11)
+    @TargetApi(14)
     private SparseBooleanArray cloneCheckStates() {
         if (mCheckStates == null) {
             return null;
@@ -3792,7 +3792,7 @@ public class TwoWayView extends AdapterView<ListAdapter> implements
 
         SparseBooleanArray checkedStates;
 
-        if (Build.VERSION.SDK_INT >= 11) {
+        if (Build.VERSION.SDK_INT >= 14) {
             checkedStates = mCheckStates.clone();
         } else {
             checkedStates = new SparseBooleanArray();

From b639aae0b4dac0d3aa665a7fba0f1e53e8a89abf Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@mozilla.com>
Date: Mon, 25 Feb 2013 19:56:04 +0000
Subject: [PATCH 32/64] Bug 844592 - Define awesome_bar_entry on tablet toolbar
 layout (r=mfinkle)

---
 .../resources/layout-large-v11/browser_toolbar_menu.xml.in     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in b/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in
index 350b8f21d48..5066a61be03 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in
@@ -70,7 +70,8 @@
                                   android:clickable="true"
                                   android:focusable="true">
 
-                <Gecko.ImageView style="@style/AddressBar.Button"
+                <Gecko.ImageView android:id="@+id/awesome_bar_entry"
+                                 style="@style/AddressBar.Button"
                                  android:layout_marginLeft="20dp"
                                  android:layout_marginRight="0dp"
                                  android:layout_marginTop="7dp"

From ad6184732e312e49c9fb329e08c1d26cb61a9111 Mon Sep 17 00:00:00 2001
From: Kannan Vijayan <kvijayan@mozilla.com>
Date: Mon, 25 Feb 2013 15:15:38 -0500
Subject: [PATCH 33/64] Bug 844253 - Change useNewType to be a flag on
 StackFrame instead of an explicitly passed argument. r=bhackett

---
 js/src/ion/Ion.cpp                 |  5 ++---
 js/src/ion/Ion.h                   |  3 +--
 js/src/jsinterp.cpp                | 27 +++++++++++++++++++++++----
 js/src/methodjit/InvokeHelpers.cpp |  4 +++-
 js/src/methodjit/StubCalls.cpp     |  3 +--
 js/src/vm/Stack-inl.h              |  7 +++++++
 js/src/vm/Stack.cpp                |  4 ++--
 js/src/vm/Stack.h                  | 24 +++++++++++++++++-------
 8 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index b5bb7452bc8..bd91164fcee 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -1472,8 +1472,7 @@ ion::CanEnterAtBranch(JSContext *cx, JSScript *script, AbstractFramePtr fp,
 }
 
 MethodStatus
-ion::CanEnter(JSContext *cx, JSScript *script, AbstractFramePtr fp,
-              bool isConstructing, bool newType)
+ion::CanEnter(JSContext *cx, JSScript *script, AbstractFramePtr fp, bool isConstructing)
 {
     JS_ASSERT(ion::IsEnabled(cx));
 
@@ -1495,7 +1494,7 @@ ion::CanEnter(JSContext *cx, JSScript *script, AbstractFramePtr fp,
     if (isConstructing && fp.thisValue().isPrimitive()) {
         RootedScript scriptRoot(cx, script);
         RootedObject callee(cx, &fp.callee());
-        RootedObject obj(cx, CreateThisForFunction(cx, callee, newType));
+        RootedObject obj(cx, CreateThisForFunction(cx, callee, fp.useNewType()));
         if (!obj)
             return Method_Skipped;
         fp.thisValue().setObject(*obj);
diff --git a/js/src/ion/Ion.h b/js/src/ion/Ion.h
index 407e09cabb8..c7b069a95cf 100644
--- a/js/src/ion/Ion.h
+++ b/js/src/ion/Ion.h
@@ -261,8 +261,7 @@ bool SetIonContext(IonContext *ctx);
 
 MethodStatus CanEnterAtBranch(JSContext *cx, JSScript *script,
                               AbstractFramePtr fp, jsbytecode *pc, bool isConstructing);
-MethodStatus CanEnter(JSContext *cx, JSScript *script, AbstractFramePtr fp,
-                      bool isConstructing, bool newType);
+MethodStatus CanEnter(JSContext *cx, JSScript *script, AbstractFramePtr fp, bool isConstructing);
 MethodStatus CanEnterUsingFastInvoke(JSContext *cx, HandleScript script, uint32_t numActualArgs);
 
 enum IonExecStatus
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 16a27833f51..d15c9d720a6 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -276,6 +276,22 @@ js::RunScript(JSContext *cx, StackFrame *fp)
 
     JS_CHECK_RECURSION(cx, return false);
 
+    // Check to see if useNewType flag should be set for this frame.
+    if (fp->isFunctionFrame() && fp->isConstructing() && !fp->isGeneratorFrame() &&
+        cx->typeInferenceEnabled())
+    {
+        StackIter iter(cx);
+        if (!iter.done()) {
+            ++iter;
+            if (iter.isScript()) {
+                RawScript script = iter.script();
+                jsbytecode *pc = iter.pc();
+                if (UseNewType(cx, script, pc))
+                    fp->setUseNewType();
+            }
+        }
+    }
+
 #ifdef DEBUG
     struct CheckStackBalance {
         JSContext *cx;
@@ -294,7 +310,7 @@ js::RunScript(JSContext *cx, StackFrame *fp)
 #ifdef JS_ION
     if (ion::IsEnabled(cx)) {
         ion::MethodStatus status = ion::CanEnter(cx, script, AbstractFramePtr(fp),
-                                                 fp->isConstructing(), false);
+                                                 fp->isConstructing());
         if (status == ion::Method_Error)
             return false;
         if (status == ion::Method_Compiled) {
@@ -1159,7 +1175,7 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
     if (interpMode == JSINTERP_NORMAL) {
         StackFrame *fp = regs.fp();
         if (!fp->isGeneratorFrame()) {
-            if (!fp->prologue(cx, UseNewTypeAtEntry(cx, fp)))
+            if (!fp->prologue(cx))
                 goto error;
         } else {
             Probes::enterScript(cx, script, script->function(), fp);
@@ -2361,6 +2377,9 @@ BEGIN_CASE(JSOP_FUNCALL)
     funScript = fun->nonLazyScript();
     if (!cx->stack.pushInlineFrame(cx, regs, args, fun, funScript, initial))
         goto error;
+ 
+    if (newType)
+        regs.fp()->setUseNewType();
 
     SET_SCRIPT(regs.fp()->script());
 #ifdef JS_METHODJIT
@@ -2370,7 +2389,7 @@ BEGIN_CASE(JSOP_FUNCALL)
 #ifdef JS_ION
     if (!newType && ion::IsEnabled(cx)) {
         ion::MethodStatus status = ion::CanEnter(cx, script, AbstractFramePtr(regs.fp()),
-                                                 regs.fp()->isConstructing(), newType);
+                                                 regs.fp()->isConstructing());
         if (status == ion::Method_Error)
             goto error;
         if (status == ion::Method_Compiled) {
@@ -2405,7 +2424,7 @@ BEGIN_CASE(JSOP_FUNCALL)
     }
 #endif
 
-    if (!regs.fp()->prologue(cx, newType))
+    if (!regs.fp()->prologue(cx))
         goto error;
     if (cx->compartment->debugMode()) {
         switch (ScriptDebugPrologue(cx, regs.fp())) {
diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp
index 01677beaf98..0c1ee81d9b3 100644
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -940,7 +940,9 @@ js_InternalInterpret(void *returnData, void *returnType, void *returnReg, js::VM
             return js_InternalThrow(f);
         fp->initVarsToUndefined();
         fp->scopeChain();
-        if (!fp->prologue(cx, types::UseNewTypeAtEntry(cx, fp)))
+        if (types::UseNewTypeAtEntry(cx, fp))
+            fp->setUseNewType();
+        if (!fp->prologue(cx))
             return js_InternalThrow(f);
 
         /*
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index 3f82f21e251..496a6a59a15 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -808,8 +808,7 @@ stubs::TriggerIonCompile(VMFrame &f)
             compileStatus = ion::CanEnterAtBranch(f.cx, script, f.cx->fp(), osrPC,
                                                   f.fp()->isConstructing());
         } else {
-            compileStatus = ion::CanEnter(f.cx, script, f.cx->fp(), f.fp()->isConstructing(),
-                                          /* newType = */ false);
+            compileStatus = ion::CanEnter(f.cx, script, f.cx->fp(), f.fp()->isConstructing());
         }
 
         if (compileStatus != ion::Method_Compiled) {
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
index 1ca3b328c7c..ae947ae5ff6 100644
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -738,6 +738,13 @@ AbstractFramePtr::hasCallObj() const
     return false;
 }
 inline bool
+AbstractFramePtr::useNewType() const
+{
+    if (isStackFrame())
+        return asStackFrame()->useNewType();
+    return false;
+}
+inline bool
 AbstractFramePtr::isGeneratorFrame() const
 {
     if (isStackFrame())
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 71020d99c33..d6ae424492d 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -307,7 +307,7 @@ StackFrame::initFunctionScopeObjects(JSContext *cx)
 }
 
 bool
-StackFrame::prologue(JSContext *cx, bool newType)
+StackFrame::prologue(JSContext *cx)
 {
     RootedScript script(cx, this->script());
 
@@ -339,7 +339,7 @@ StackFrame::prologue(JSContext *cx, bool newType)
 
     if (isConstructing()) {
         RootedObject callee(cx, &this->callee());
-        JSObject *obj = CreateThisForFunction(cx, callee, newType);
+        JSObject *obj = CreateThisForFunction(cx, callee, useNewType());
         if (!obj)
             return false;
         functionThis() = ObjectValue(*obj);
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index 7241bb39739..2f37e0909e4 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -297,6 +297,7 @@ class AbstractFramePtr
     inline bool hasArgsObj() const;
     inline ArgumentsObject &argsObj() const;
     inline void initArgsObj(ArgumentsObject &argsobj) const;
+    inline bool useNewType() const;
 
     inline bool copyRawFrameSlots(AutoValueVector *vec) const;
 
@@ -389,10 +390,13 @@ class StackFrame
         HAS_PUSHED_SPS_FRAME = 0x100000,  /* SPS was notified of enty */
 
         /* Ion frame state */
-        RUNNING_IN_ION       = 0x200000,  /* frame is running in Ion */
-        CALLING_INTO_ION     = 0x400000,  /* frame is calling into Ion */
+        RUNNING_IN_ION     =   0x200000,  /* frame is running in Ion */
+        CALLING_INTO_ION   =   0x400000,  /* frame is calling into Ion */
 
-        JIT_REVISED_STACK    = 0x800000   /* sp was revised by JIT for lowered apply */
+        JIT_REVISED_STACK  =   0x800000,  /* sp was revised by JIT for lowered apply */
+
+        /* Miscellaneous state. */
+        USE_NEW_TYPE       =  0x1000000   /* Use new type for constructed |this| object. */
     };
 
   private:
@@ -489,12 +493,9 @@ class StackFrame
      * over-recursed) after pushing the stack frame but before 'prologue' is
      * called or completes fully. To simplify usage, 'epilogue' does not assume
      * 'prologue' has completed and handles all the intermediate state details.
-     *
-     * The 'newType' option indicates whether the constructed 'this' value (if
-     * there is one) should be given a new singleton type.
      */
 
-    bool prologue(JSContext *cx, bool newType);
+    bool prologue(JSContext *cx);
     void epilogue(JSContext *cx);
 
     /* Subsets of 'prologue' called from jit code. */
@@ -1052,6 +1053,15 @@ class StackFrame
         return flags_ & HAS_ARGS_OBJ;
     }
 
+    void setUseNewType() {
+        JS_ASSERT(isConstructing());
+        flags_ |= USE_NEW_TYPE;
+    }
+    bool useNewType() const {
+        JS_ASSERT(isConstructing());
+        return flags_ & USE_NEW_TYPE;
+    }
+
     /*
      * The method JIT call/apply optimization can erase Function.{call,apply}
      * invocations from the stack and push the callee frame directly. The base

From df84f1ce02e78d538dcfe5fbc369463f842b3f7a Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Tue, 19 Feb 2013 14:29:04 -0800
Subject: [PATCH 34/64] Bug 842609: Scroll to selected tab in tabs ui.
 [r=mfinkle]

--HG--
rename : toolkit/modules/Timer.jsm => browser/devtools/shared/Browser.jsm
rename : toolkit/modules/tests/xpcshell/test_timer.js => browser/devtools/shared/test/browser_browser_basic.js
extra : rebase_source : c5a6cb3d09bd673b4ac01afa90de9bc8f350601b
---
 mobile/android/base/TabsTray.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/android/base/TabsTray.java b/mobile/android/base/TabsTray.java
index 40bdb9b9d51..209281b7c70 100644
--- a/mobile/android/base/TabsTray.java
+++ b/mobile/android/base/TabsTray.java
@@ -201,6 +201,9 @@ public class TabsTray extends TwoWayView
             int selected = getPositionForTab(Tabs.getInstance().getSelectedTab());
             for (int i=0; i < getCount(); i++)
                  TabsTray.this.setItemChecked(i, (i == selected));
+
+            if (selected != -1)
+                TabsTray.this.setSelection(selected);
         }
 
         public void clear() {

From fe9ad4a2d1ce922e04d7f3a3c670bc40a0771255 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 25 Feb 2013 15:37:23 -0500
Subject: [PATCH 35/64] Backed out changesets e8202e140fd8 and b1cd489945f5
 (bug 844328) for mochitest-bc orange on a CLOSED TREE.

---
 browser/devtools/shared/Browser.jsm           | 74 +++++++++++++++++--
 .../shared/test/browser_browser_basic.js      | 11 +++
 browser/metro/base/content/input.js           |  2 +-
 layout/tools/reftest/reftest-content.js       | 37 +++++++++-
 toolkit/modules/Makefile.in                   |  1 -
 toolkit/modules/Timer.jsm                     | 41 ----------
 toolkit/modules/tests/xpcshell/test_timer.js  | 28 -------
 toolkit/modules/tests/xpcshell/xpcshell.ini   |  1 -
 8 files changed, 115 insertions(+), 80 deletions(-)
 delete mode 100644 toolkit/modules/Timer.jsm
 delete mode 100644 toolkit/modules/tests/xpcshell/test_timer.js

diff --git a/browser/devtools/shared/Browser.jsm b/browser/devtools/shared/Browser.jsm
index 49e0a194728..8ae927c2b03 100644
--- a/browser/devtools/shared/Browser.jsm
+++ b/browser/devtools/shared/Browser.jsm
@@ -20,9 +20,73 @@ this.EXPORTED_SYMBOLS = [ "Node", "HTMLElement", "setTimeout", "clearTimeout" ];
 this.Node = Components.interfaces.nsIDOMNode;
 this.HTMLElement = Components.interfaces.nsIDOMHTMLElement;
 
-/*
- * Import and re-export the timeout functions from Timer.jsm.
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+/**
+ * The next value to be returned by setTimeout
  */
-let Timer = Components.utils.import("resource://gre/modules/Timer.jsm", {});
-this.setTimeout = Timer.setTimeout;
-this.clearTimeout = Timer.clearTimeout;
+let nextID = 1;
+
+/**
+ * The map of outstanding timeouts
+ */
+const timers = {};
+
+/**
+ * Object to be passed to Timer.initWithCallback()
+ */
+function TimerCallback(callback) {
+  this._callback = callback;
+  const interfaces = [ Components.interfaces.nsITimerCallback ];
+  this.QueryInterface = XPCOMUtils.generateQI(interfaces);
+}
+
+TimerCallback.prototype.notify = function(timer) {
+  try {
+    for (let timerID in timers) {
+      if (timers[timerID] === timer) {
+        delete timers[timerID];
+        break;
+      }
+    }
+    this._callback.apply(null, []);
+  }
+  catch (ex) {
+    dump(ex +  '\n');
+  }
+};
+
+/**
+ * Executes a code snippet or a function after specified delay.
+ * This is designed to have the same interface contract as the browser
+ * function.
+ * @param callback is the function you want to execute after the delay.
+ * @param delay is the number of milliseconds that the function call should
+ * be delayed by. Note that the actual delay may be longer, see Notes below.
+ * @return the ID of the timeout, which can be used later with
+ * window.clearTimeout.
+ */
+this.setTimeout = function setTimeout(callback, delay) {
+  const timer = Components.classes["@mozilla.org/timer;1"]
+                        .createInstance(Components.interfaces.nsITimer);
+
+  let timerID = nextID++;
+  timers[timerID] = timer;
+
+  timer.initWithCallback(new TimerCallback(callback), delay, timer.TYPE_ONE_SHOT);
+  return timerID;
+};
+
+/**
+ * Clears the delay set by window.setTimeout() and prevents the callback from
+ * being executed (if it hasn't been executed already)
+ * @param timerID the ID of the timeout you wish to clear, as returned by
+ * window.setTimeout().
+ */
+this.clearTimeout = function clearTimeout(timerID) {
+  let timer = timers[timerID];
+  if (timer) {
+    timer.cancel();
+    delete timers[timerID];
+  }
+};
diff --git a/browser/devtools/shared/test/browser_browser_basic.js b/browser/devtools/shared/test/browser_browser_basic.js
index d704dc639f6..4276672055c 100644
--- a/browser/devtools/shared/test/browser_browser_basic.js
+++ b/browser/devtools/shared/test/browser_browser_basic.js
@@ -19,8 +19,19 @@ function test() {
 }
 
 function runTest(browser, tab, document) {
+  let timeout = imported.setTimeout(shouldNotBeCalled, 100);
+  imported.clearTimeout(timeout);
+
   var p = document.getElementById("id");
 
   ok(p instanceof imported.Node, "Node correctly defined");
   ok(p instanceof imported.HTMLElement, "HTMLElement correctly defined");
+
+  let timeout = imported.setTimeout(function() {
+    finish();
+  }, 100);
+}
+
+function shouldNotBeCalled() {
+  ok(false, "Timeout cleared");
 }
diff --git a/browser/metro/base/content/input.js b/browser/metro/base/content/input.js
index 0f0c1c55a20..51e45927b80 100644
--- a/browser/metro/base/content/input.js
+++ b/browser/metro/base/content/input.js
@@ -219,7 +219,7 @@ var TouchModule = {
     this._targetScrollInterface = targetScrollInterface;
 
     if (!this._targetScrollbox) {
-      return;
+      return false;
     }
 
     // XXX shouldn't dragger always be valid here?
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index 014dfcc1b1a..3e78eddc6c7 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -7,7 +7,40 @@
 const CC = Components.classes;
 const CI = Components.interfaces;
 const CR = Components.results;
-const CU = Components.utils;
+
+/**
+ * FIXME/bug 622224: work around lack of reliable setTimeout available
+ * to frame scripts.
+ */
+// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4
+// days.  Should be fine as a temporary workaround.
+var gNextTimeoutId = 0;
+var gTimeoutTable = { };        // int -> nsITimer
+
+function setTimeout(callbackFn, delayMs) {
+    var id = gNextTimeoutId++;
+    var timer = CC["@mozilla.org/timer;1"].createInstance(CI.nsITimer);
+    timer.initWithCallback({
+        notify: function notify_callback() {
+                    clearTimeout(id);
+                    callbackFn();
+                }
+        },
+        delayMs,
+        timer.TYPE_ONE_SHOT);
+
+    gTimeoutTable[id] = timer;
+
+    return id;
+}
+
+function clearTimeout(id) {
+    var timer = gTimeoutTable[id];
+    if (timer) {
+        timer.cancel();
+        delete gTimeoutTable[id];
+    }
+}
 
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 
@@ -17,8 +50,6 @@ const PRINTSETTINGS_CONTRACTID = "@mozilla.org/gfx/printsettings-service;1";
 // "<!--CLEAR-->"
 const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
-CU.import("resource://gre/modules/Timer.jsm");
-
 var gBrowserIsRemote;
 var gHaveCanvasSnapshot = false;
 // Plugin layers can be updated asynchronously, so to make sure that all
diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in
index 60554c16423..4f434134570 100644
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -15,7 +15,6 @@ EXTRA_JS_MODULES := \
   NewTabUtils.jsm \
   Sqlite.jsm \
   TelemetryTimestamps.jsm \
-  Timer.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/modules/Timer.jsm b/toolkit/modules/Timer.jsm
deleted file mode 100644
index fcca537f2f2..00000000000
--- a/toolkit/modules/Timer.jsm
+++ /dev/null
@@ -1,41 +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/. */
-
-"use strict";
-
-/**
- * JS module implementation of nsIDOMJSWindow.setTimeout and clearTimeout.
- */
-
-this.EXPORTED_SYMBOLS = ["setTimeout", "clearTimeout"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
-let gNextTimeoutId = 1; // setTimeout must return a positive integer
-
-let gTimeoutTable = new Map(); // int -> nsITimer
-
-function setTimeout(aCallback, aMilliseconds) {
-  let id = gNextTimeoutId++;
-  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-  timer.initWithCallback(function setTimeout_timer() {
-    gTimeoutTable.delete(id);
-    aCallback();
-  }, aMilliseconds, timer.TYPE_ONE_SHOT);
-
-  gTimeoutTable.set(id, timer);
-  return id;
-}
-
-function clearTimeout(aId) {
-  if (gTimeoutTable.has(aId)) {
-    gTimeoutTable.get(aId).cancel();
-    gTimeoutTable.delete(aId);
-  }
-}
diff --git a/toolkit/modules/tests/xpcshell/test_timer.js b/toolkit/modules/tests/xpcshell/test_timer.js
deleted file mode 100644
index 57981bc7585..00000000000
--- a/toolkit/modules/tests/xpcshell/test_timer.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Tests exports from Timer.jsm
-
-let imported = {};
-Components.utils.import("resource://gre/modules/Timer.jsm", imported);
-
-function run_test(browser, tab, document) {
-  do_test_pending();
-
-  let timeout1 = imported.setTimeout(function() do_throw("Should not be called"), 100);
-  do_check_eq(typeof timeout1, "number", "setTimeout returns a number");
-  do_check_true(timeout1 > 0, "setTimeout returns a positive number");
-
-  let timeout2 = imported.setTimeout(function() {
-    do_check_true(true, "Should be called");
-    do_test_finished();
-  }, 100);
-
-  do_check_eq(typeof timeout2, "number", "setTimeout returns a number");
-  do_check_true(timeout2 > 0, "setTimeout returns a positive number");
-  do_check_neq(timeout1, timeout2, "Calling setTimeout again returns a different value");
-
-  imported.clearTimeout(timeout1);
-}
diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini
index de3b2dcac6e..1255e7d635e 100644
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -5,4 +5,3 @@ tail =
 [test_newtab-migrate-v1.js]
 [test_sqlite.js]
 [test_TelemetryTimestamps.js]
-[test_timer.js]

From 80bf18a6e3272565edcfdcea3453db21047d7d10 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 25 Feb 2013 11:08:25 -0800
Subject: [PATCH 36/64] Bug 844328 - Silence debug warning about _onTouchStart
 return value [r=jimm]

---
 browser/metro/base/content/input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/metro/base/content/input.js b/browser/metro/base/content/input.js
index 51e45927b80..0f0c1c55a20 100644
--- a/browser/metro/base/content/input.js
+++ b/browser/metro/base/content/input.js
@@ -219,7 +219,7 @@ var TouchModule = {
     this._targetScrollInterface = targetScrollInterface;
 
     if (!this._targetScrollbox) {
-      return false;
+      return;
     }
 
     // XXX shouldn't dragger always be valid here?

From 8fc0608e024531537ed762ccda7fc48d54815f6b Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 25 Feb 2013 15:50:49 -0500
Subject: [PATCH 37/64] Bug 840721 - Add a PostDelayedTask method to the
 GeckoContentController interface. r=cjones

---
 gfx/layers/ipc/AsyncPanZoomController.cpp | 8 ++++++++
 gfx/layers/ipc/AsyncPanZoomController.h   | 6 ++++++
 gfx/layers/ipc/GeckoContentController.h   | 8 ++++++++
 gfx/layers/ipc/GestureEventListener.cpp   | 6 ++----
 gfx/layers/ipc/GestureEventListener.h     | 5 ++++-
 layout/ipc/RenderFrameParent.cpp          | 5 +++++
 6 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/gfx/layers/ipc/AsyncPanZoomController.cpp b/gfx/layers/ipc/AsyncPanZoomController.cpp
index d8cf298cb23..13393508452 100644
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -1489,6 +1489,14 @@ void AsyncPanZoomController::UpdateZoomConstraints(bool aAllowZoom,
   mMaxZoom = aMaxZoom;
 }
 
+void AsyncPanZoomController::PostDelayedTask(Task* aTask, int aDelayMs) {
+  if (!mGeckoContentController) {
+    return;
+  }
+
+  mGeckoContentController->PostDelayedTask(aTask, aDelayMs);
+}
+
 void AsyncPanZoomController::SendAsyncScrollEvent() {
   if (!mGeckoContentController) {
     return;
diff --git a/gfx/layers/ipc/AsyncPanZoomController.h b/gfx/layers/ipc/AsyncPanZoomController.h
index db5509dde2b..1bc59be283f 100644
--- a/gfx/layers/ipc/AsyncPanZoomController.h
+++ b/gfx/layers/ipc/AsyncPanZoomController.h
@@ -151,6 +151,12 @@ public:
    */
   void UpdateZoomConstraints(bool aAllowZoom, float aMinScale, float aMaxScale);
 
+  /**
+   * Schedules a runnable to run on the controller/UI thread at some time
+   * in the future.
+   */
+  void PostDelayedTask(Task* aTask, int aDelayMs);
+
   // --------------------------------------------------------------------------
   // These methods must only be called on the compositor thread.
   //
diff --git a/gfx/layers/ipc/GeckoContentController.h b/gfx/layers/ipc/GeckoContentController.h
index 78ae9edd119..9f508992230 100644
--- a/gfx/layers/ipc/GeckoContentController.h
+++ b/gfx/layers/ipc/GeckoContentController.h
@@ -10,6 +10,8 @@
 #include "FrameMetrics.h"
 #include "nsISupportsImpl.h"
 
+class Task;
+
 namespace mozilla {
 namespace layers {
 
@@ -52,6 +54,12 @@ public:
   virtual void SendAsyncScrollDOMEvent(const gfx::Rect &aContentRect,
                                        const gfx::Size &aScrollableSize) = 0;
 
+  /**
+   * Schedules a runnable to run on the controller/UI thread at some time
+   * in the future.
+   */
+  virtual void PostDelayedTask(Task* aTask, int aDelayMs) = 0;
+
   GeckoContentController() {}
   virtual ~GeckoContentController() {}
 };
diff --git a/gfx/layers/ipc/GestureEventListener.cpp b/gfx/layers/ipc/GestureEventListener.cpp
index bb36c61fee9..d7ca9528b43 100644
--- a/gfx/layers/ipc/GestureEventListener.cpp
+++ b/gfx/layers/ipc/GestureEventListener.cpp
@@ -88,8 +88,7 @@ nsEventStatus GestureEventListener::HandleInputEvent(const InputData& aEvent)
         mLongTapTimeoutTask =
           NewRunnableMethod(this, &GestureEventListener::TimeoutLongTap);
 
-        MessageLoop::current()->PostDelayedTask(
-          FROM_HERE,
+        mAsyncPanZoomController->PostDelayedTask(
           mLongTapTimeoutTask,
           Preferences::GetInt("ui.click_hold_context_menus.delay", 500));
       }
@@ -169,8 +168,7 @@ nsEventStatus GestureEventListener::HandleInputEvent(const InputData& aEvent)
         mDoubleTapTimeoutTask =
           NewRunnableMethod(this, &GestureEventListener::TimeoutDoubleTap);
 
-        MessageLoop::current()->PostDelayedTask(
-          FROM_HERE,
+        mAsyncPanZoomController->PostDelayedTask(
           mDoubleTapTimeoutTask,
           MAX_TAP_TIME);
       }
diff --git a/gfx/layers/ipc/GestureEventListener.h b/gfx/layers/ipc/GestureEventListener.h
index ca4b2a33a32..268e49b0b09 100644
--- a/gfx/layers/ipc/GestureEventListener.h
+++ b/gfx/layers/ipc/GestureEventListener.h
@@ -1,4 +1,7 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set sw=4 ts=8 et tw=80 : */ /* 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
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=4 ts=8 et tw=80 : */
+/* 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_layers_GestureEventListener_h
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index e240c6ebd82..4f394c48ea6 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -569,6 +569,11 @@ public:
     }
   }
 
+  virtual void PostDelayedTask(Task* aTask, int aDelayMs) MOZ_OVERRIDE
+  {
+    MessageLoop::current()->PostDelayedTask(FROM_HERE, aTask, aDelayMs);
+  }
+
 private:
   void DoRequestContentRepaint(const FrameMetrics& aFrameMetrics)
   {

From 560399481a57904bd4c00baae463cfd4f9336e5e Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 25 Feb 2013 11:08:33 -0800
Subject: [PATCH 38/64] Bug 840360 - Extract reftest-content.js's setTimeout
 implementation into new Timer.jsm [r=jwalker r=cjones sr=gavin]

--HG--
rename : browser/devtools/shared/Browser.jsm => toolkit/modules/Timer.jsm
rename : browser/devtools/shared/test/browser_browser_basic.js => toolkit/modules/tests/xpcshell/test_timer.js
---
 browser/devtools/shared/Browser.jsm           | 74 ++-----------------
 .../shared/test/browser_browser_basic.js      | 11 +--
 layout/tools/reftest/reftest-content.js       | 37 +---------
 toolkit/modules/Makefile.in                   |  1 +
 toolkit/modules/Timer.jsm                     | 41 ++++++++++
 toolkit/modules/tests/xpcshell/test_timer.js  | 28 +++++++
 toolkit/modules/tests/xpcshell/xpcshell.ini   |  1 +
 7 files changed, 80 insertions(+), 113 deletions(-)
 create mode 100644 toolkit/modules/Timer.jsm
 create mode 100644 toolkit/modules/tests/xpcshell/test_timer.js

diff --git a/browser/devtools/shared/Browser.jsm b/browser/devtools/shared/Browser.jsm
index 8ae927c2b03..49e0a194728 100644
--- a/browser/devtools/shared/Browser.jsm
+++ b/browser/devtools/shared/Browser.jsm
@@ -20,73 +20,9 @@ this.EXPORTED_SYMBOLS = [ "Node", "HTMLElement", "setTimeout", "clearTimeout" ];
 this.Node = Components.interfaces.nsIDOMNode;
 this.HTMLElement = Components.interfaces.nsIDOMHTMLElement;
 
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-/**
- * The next value to be returned by setTimeout
+/*
+ * Import and re-export the timeout functions from Timer.jsm.
  */
-let nextID = 1;
-
-/**
- * The map of outstanding timeouts
- */
-const timers = {};
-
-/**
- * Object to be passed to Timer.initWithCallback()
- */
-function TimerCallback(callback) {
-  this._callback = callback;
-  const interfaces = [ Components.interfaces.nsITimerCallback ];
-  this.QueryInterface = XPCOMUtils.generateQI(interfaces);
-}
-
-TimerCallback.prototype.notify = function(timer) {
-  try {
-    for (let timerID in timers) {
-      if (timers[timerID] === timer) {
-        delete timers[timerID];
-        break;
-      }
-    }
-    this._callback.apply(null, []);
-  }
-  catch (ex) {
-    dump(ex +  '\n');
-  }
-};
-
-/**
- * Executes a code snippet or a function after specified delay.
- * This is designed to have the same interface contract as the browser
- * function.
- * @param callback is the function you want to execute after the delay.
- * @param delay is the number of milliseconds that the function call should
- * be delayed by. Note that the actual delay may be longer, see Notes below.
- * @return the ID of the timeout, which can be used later with
- * window.clearTimeout.
- */
-this.setTimeout = function setTimeout(callback, delay) {
-  const timer = Components.classes["@mozilla.org/timer;1"]
-                        .createInstance(Components.interfaces.nsITimer);
-
-  let timerID = nextID++;
-  timers[timerID] = timer;
-
-  timer.initWithCallback(new TimerCallback(callback), delay, timer.TYPE_ONE_SHOT);
-  return timerID;
-};
-
-/**
- * Clears the delay set by window.setTimeout() and prevents the callback from
- * being executed (if it hasn't been executed already)
- * @param timerID the ID of the timeout you wish to clear, as returned by
- * window.setTimeout().
- */
-this.clearTimeout = function clearTimeout(timerID) {
-  let timer = timers[timerID];
-  if (timer) {
-    timer.cancel();
-    delete timers[timerID];
-  }
-};
+let Timer = Components.utils.import("resource://gre/modules/Timer.jsm", {});
+this.setTimeout = Timer.setTimeout;
+this.clearTimeout = Timer.clearTimeout;
diff --git a/browser/devtools/shared/test/browser_browser_basic.js b/browser/devtools/shared/test/browser_browser_basic.js
index 4276672055c..d9b3984b0e7 100644
--- a/browser/devtools/shared/test/browser_browser_basic.js
+++ b/browser/devtools/shared/test/browser_browser_basic.js
@@ -19,19 +19,10 @@ function test() {
 }
 
 function runTest(browser, tab, document) {
-  let timeout = imported.setTimeout(shouldNotBeCalled, 100);
-  imported.clearTimeout(timeout);
-
   var p = document.getElementById("id");
 
   ok(p instanceof imported.Node, "Node correctly defined");
   ok(p instanceof imported.HTMLElement, "HTMLElement correctly defined");
 
-  let timeout = imported.setTimeout(function() {
-    finish();
-  }, 100);
-}
-
-function shouldNotBeCalled() {
-  ok(false, "Timeout cleared");
+  finish();
 }
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index 3e78eddc6c7..014dfcc1b1a 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -7,40 +7,7 @@
 const CC = Components.classes;
 const CI = Components.interfaces;
 const CR = Components.results;
-
-/**
- * FIXME/bug 622224: work around lack of reliable setTimeout available
- * to frame scripts.
- */
-// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4
-// days.  Should be fine as a temporary workaround.
-var gNextTimeoutId = 0;
-var gTimeoutTable = { };        // int -> nsITimer
-
-function setTimeout(callbackFn, delayMs) {
-    var id = gNextTimeoutId++;
-    var timer = CC["@mozilla.org/timer;1"].createInstance(CI.nsITimer);
-    timer.initWithCallback({
-        notify: function notify_callback() {
-                    clearTimeout(id);
-                    callbackFn();
-                }
-        },
-        delayMs,
-        timer.TYPE_ONE_SHOT);
-
-    gTimeoutTable[id] = timer;
-
-    return id;
-}
-
-function clearTimeout(id) {
-    var timer = gTimeoutTable[id];
-    if (timer) {
-        timer.cancel();
-        delete gTimeoutTable[id];
-    }
-}
+const CU = Components.utils;
 
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 
@@ -50,6 +17,8 @@ const PRINTSETTINGS_CONTRACTID = "@mozilla.org/gfx/printsettings-service;1";
 // "<!--CLEAR-->"
 const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
+CU.import("resource://gre/modules/Timer.jsm");
+
 var gBrowserIsRemote;
 var gHaveCanvasSnapshot = false;
 // Plugin layers can be updated asynchronously, so to make sure that all
diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in
index 4f434134570..60554c16423 100644
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -15,6 +15,7 @@ EXTRA_JS_MODULES := \
   NewTabUtils.jsm \
   Sqlite.jsm \
   TelemetryTimestamps.jsm \
+  Timer.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/modules/Timer.jsm b/toolkit/modules/Timer.jsm
new file mode 100644
index 00000000000..fcca537f2f2
--- /dev/null
+++ b/toolkit/modules/Timer.jsm
@@ -0,0 +1,41 @@
+/* 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/. */
+
+"use strict";
+
+/**
+ * JS module implementation of nsIDOMJSWindow.setTimeout and clearTimeout.
+ */
+
+this.EXPORTED_SYMBOLS = ["setTimeout", "clearTimeout"];
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
+let gNextTimeoutId = 1; // setTimeout must return a positive integer
+
+let gTimeoutTable = new Map(); // int -> nsITimer
+
+function setTimeout(aCallback, aMilliseconds) {
+  let id = gNextTimeoutId++;
+  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer.initWithCallback(function setTimeout_timer() {
+    gTimeoutTable.delete(id);
+    aCallback();
+  }, aMilliseconds, timer.TYPE_ONE_SHOT);
+
+  gTimeoutTable.set(id, timer);
+  return id;
+}
+
+function clearTimeout(aId) {
+  if (gTimeoutTable.has(aId)) {
+    gTimeoutTable.get(aId).cancel();
+    gTimeoutTable.delete(aId);
+  }
+}
diff --git a/toolkit/modules/tests/xpcshell/test_timer.js b/toolkit/modules/tests/xpcshell/test_timer.js
new file mode 100644
index 00000000000..57981bc7585
--- /dev/null
+++ b/toolkit/modules/tests/xpcshell/test_timer.js
@@ -0,0 +1,28 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests exports from Timer.jsm
+
+let imported = {};
+Components.utils.import("resource://gre/modules/Timer.jsm", imported);
+
+function run_test(browser, tab, document) {
+  do_test_pending();
+
+  let timeout1 = imported.setTimeout(function() do_throw("Should not be called"), 100);
+  do_check_eq(typeof timeout1, "number", "setTimeout returns a number");
+  do_check_true(timeout1 > 0, "setTimeout returns a positive number");
+
+  let timeout2 = imported.setTimeout(function() {
+    do_check_true(true, "Should be called");
+    do_test_finished();
+  }, 100);
+
+  do_check_eq(typeof timeout2, "number", "setTimeout returns a number");
+  do_check_true(timeout2 > 0, "setTimeout returns a positive number");
+  do_check_neq(timeout1, timeout2, "Calling setTimeout again returns a different value");
+
+  imported.clearTimeout(timeout1);
+}
diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini
index 1255e7d635e..de3b2dcac6e 100644
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -5,3 +5,4 @@ tail =
 [test_newtab-migrate-v1.js]
 [test_sqlite.js]
 [test_TelemetryTimestamps.js]
+[test_timer.js]

From 9d871b957ca45f44b8c6c67d6338f5ee83acba7c Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 26 Feb 2013 10:18:48 +1300
Subject: [PATCH 39/64] Bug 841308 - Make WillPaintWindow be called for cocoa
 popups. r=roc

---
 view/src/nsView.cpp         |  2 ++
 widget/cocoa/nsChildView.h  |  3 +++
 widget/cocoa/nsChildView.mm | 29 +++++++++++++++++++++--------
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 33a07b93b62..038c20c3e90 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -310,6 +310,8 @@ void nsView::NotifyEffectiveVisibilityChanged(bool aEffectivelyVisible)
     DropMouseGrabbing();
   }
 
+  SetForcedRepaint(true);
+
   if (nullptr != mWindow)
   {
     if (aEffectivelyVisible)
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index f738fc9b99e..cec5edca970 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -485,6 +485,7 @@ public:
   
   virtual bool      DispatchWindowEvent(nsGUIEvent& event);
 
+  void WillPaintWindow();
   bool PaintWindow(nsIntRegion aRegion, bool aIsAlternate);
 
 #ifdef ACCESSIBILITY
@@ -558,6 +559,8 @@ protected:
     return widget.forget();
   }
 
+  nsIWidget* GetWidgetForListenerEvents();
+
 protected:
 
   NSView<mozView>*      mView;      // my parallel cocoa view (ChildView or NativeScrollbarView), [STRONG]
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index ef81656be2a..1fce1421b62 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -1494,19 +1494,35 @@ bool nsChildView::DispatchWindowEvent(nsGUIEvent &event)
   return ConvertStatus(status);
 }
 
-bool nsChildView::PaintWindow(nsIntRegion aRegion, bool aIsAlternate)
+nsIWidget*
+nsChildView::GetWidgetForListenerEvents()
 {
-  nsCOMPtr<nsIWidget> widget = this;
-
   // If there is no listener, use the parent popup's listener if that exists.
   if (!mWidgetListener && mParentWidget) {
     nsWindowType type;
     mParentWidget->GetWindowType(type);
     if (type == eWindowType_popup) {
-      widget = mParentWidget;
+      return mParentWidget;
     }
   }
 
+  return this;
+}
+
+void nsChildView::WillPaintWindow()
+{
+  nsCOMPtr<nsIWidget> widget = GetWidgetForListenerEvents();
+
+  nsIWidgetListener* listener = widget->GetWidgetListener();
+  if (listener) {
+    listener->WillPaintWindow(widget);
+  }
+}
+
+bool nsChildView::PaintWindow(nsIntRegion aRegion, bool aIsAlternate)
+{
+  nsCOMPtr<nsIWidget> widget = GetWidgetForListenerEvents();
+
   nsIWidgetListener* listener = widget->GetWidgetListener();
   if (!listener)
     return false;
@@ -2693,10 +2709,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
                  afterDelay:0];
     }
 
-    nsIWidgetListener* listener = mGeckoChild->GetWidgetListener();
-    if (listener) {
-      listener->WillPaintWindow(mGeckoChild);
-    }
+    mGeckoChild->WillPaintWindow();
   }
   [super viewWillDraw];
 }

From 5db1257ac3515cb6521588c6ba4e69c4a0998cf1 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 26 Feb 2013 10:18:52 +1300
Subject: [PATCH 40/64] Bug 835045 - Use
 CreateThebesSurfaceAliasForDrawTarget_hack to avoid having multiple
 cairo_surface_quartz objects for a single CGContext. r=nrc

---
 gfx/layers/opengl/CanvasLayerOGL.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp
index 0e8474b3757..0f783c8346a 100644
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -121,7 +121,7 @@ CanvasLayerOGL::Initialize(const Data& aData)
     return;
   } else if (aData.mDrawTarget) {
     mDrawTarget = aData.mDrawTarget;
-    mCanvasSurface = gfxPlatform::GetPlatform()->GetThebesSurfaceForDrawTarget(mDrawTarget);
+    mCanvasSurface = gfxPlatform::GetPlatform()->CreateThebesSurfaceAliasForDrawTarget_hack(mDrawTarget);
     mNeedsYFlip = false;
   } else if (aData.mSurface) {
     mCanvasSurface = aData.mSurface;

From 47e9b66860344a3881f56c2c1af321c45eca4722 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Mon, 25 Feb 2013 13:24:19 -0800
Subject: [PATCH 41/64] Bug 844942 - Let switching to top-level frame work even
 when current frame is invalid, r=mdas

---
 testing/marionette/marionette-actors.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/testing/marionette/marionette-actors.js b/testing/marionette/marionette-actors.js
index 4505593d433..82bc3eac2dd 100644
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -185,7 +185,11 @@ MarionetteDriverActor.prototype = {
   switchToGlobalMessageManager: function MDA_switchToGlobalMM() {
     if (this.currentRemoteFrame !== null) {
       this.removeMessageManagerListeners(this.messageManager);
-      this.sendAsync("sleepSession");
+      try {
+        // this can fail if the frame is already gone
+        this.sendAsync("sleepSession");
+      }
+      catch(e) {}
     }
     this.messageManager = this.globalMessageManager;
     this.currentRemoteFrame = null;
@@ -1205,7 +1209,7 @@ MarionetteDriverActor.prototype = {
       }
     }
     else {
-      if ((aRequest.value == null) && (aRequest.element == null) &&
+      if ((!aRequest.value) && (!aRequest.element) &&
           (this.currentRemoteFrame !== null)) {
         // We're currently using a ChromeMessageSender for a remote frame, so this
         // request indicates we need to switch back to the top-level (parent) frame.

From 975f1de21afa0bbcb17c6db9d3f9fa664446c718 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Thu, 21 Feb 2013 14:21:57 -0800
Subject: [PATCH 42/64] Bug 843619: Remove tabs tray menu. [r=mfinkle]
 [needs-clobber]

--HG--
extra : rebase_source : 1a5f82f47ea115d38ad96af61df7dcb77babdeca
---
 mobile/android/base/Makefile.in               |  11 ----
 mobile/android/base/TabsPanel.java            |  52 +-----------------
 .../ic_menu_new_private_tab_small.png         | Bin 424 -> 0 bytes
 .../drawable-hdpi/ic_menu_new_tab_small.png   | Bin 225 -> 0 bytes
 .../drawable-large-hdpi-v11/tabs_menu.png     | Bin 118 -> 0 bytes
 .../drawable-large-mdpi-v11/tabs_menu.png     | Bin 103 -> 0 bytes
 .../drawable-large-xhdpi-v11/tabs_menu.png    | Bin 133 -> 0 bytes
 .../ic_menu_new_private_tab_small.png         | Bin 308 -> 0 bytes
 .../drawable-mdpi/ic_menu_new_tab_small.png   | Bin 175 -> 0 bytes
 .../ic_menu_new_private_tab_small.png         | Bin 637 -> 0 bytes
 .../drawable-xhdpi/ic_menu_new_tab_small.png  | Bin 327 -> 0 bytes
 .../tabs_panel_footer.xml                     |  17 +-----
 .../resources/layout/tabs_panel_header.xml    |   9 ---
 .../base/resources/menu-v11/tabs_menu.xml     |  20 -------
 .../android/base/resources/menu/tabs_menu.xml |  20 -------
 15 files changed, 4 insertions(+), 125 deletions(-)
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab_small.png
 delete mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab_small.png
 delete mode 100644 mobile/android/base/resources/drawable-large-hdpi-v11/tabs_menu.png
 delete mode 100644 mobile/android/base/resources/drawable-large-mdpi-v11/tabs_menu.png
 delete mode 100644 mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_menu.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab_small.png
 delete mode 100644 mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab_small.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab_small.png
 delete mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab_small.png
 delete mode 100644 mobile/android/base/resources/menu-v11/tabs_menu.xml
 delete mode 100644 mobile/android/base/resources/menu/tabs_menu.xml

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index f2baebcd34a..99a24db12d6 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -556,9 +556,7 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/ic_menu_close_all_tabs.png \
   res/drawable-mdpi/ic_menu_forward.png \
   res/drawable-mdpi/ic_menu_new_private_tab.png \
-  res/drawable-mdpi/ic_menu_new_private_tab_small.png \
   res/drawable-mdpi/ic_menu_new_tab.png \
-  res/drawable-mdpi/ic_menu_new_tab_small.png \
   res/drawable-mdpi/ic_menu_reload.png \
   res/drawable-mdpi/ic_status_logo.png \
   res/drawable-mdpi/progress_spinner_1.png \
@@ -669,9 +667,7 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/ic_menu_close_all_tabs.png \
   res/drawable-hdpi/ic_menu_forward.png \
   res/drawable-hdpi/ic_menu_new_private_tab.png \
-  res/drawable-hdpi/ic_menu_new_private_tab_small.png \
   res/drawable-hdpi/ic_menu_new_tab.png \
-  res/drawable-hdpi/ic_menu_new_tab_small.png \
   res/drawable-hdpi/ic_menu_reload.png \
   res/drawable-hdpi/ic_status_logo.png \
   res/drawable-hdpi/tab_indicator_divider.9.png \
@@ -762,9 +758,7 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/ic_menu_close_all_tabs.png \
   res/drawable-xhdpi/ic_menu_forward.png \
   res/drawable-xhdpi/ic_menu_new_private_tab.png \
-  res/drawable-xhdpi/ic_menu_new_private_tab_small.png \
   res/drawable-xhdpi/ic_menu_new_tab.png \
-  res/drawable-xhdpi/ic_menu_new_tab_small.png \
   res/drawable-xhdpi/ic_menu_reload.png \
   res/drawable-xhdpi/ic_status_logo.png \
   res/drawable-xhdpi/spinner_default.9.png \
@@ -912,7 +906,6 @@ RES_DRAWABLE_LARGE_MDPI_V11 = \
   res/drawable-large-mdpi-v11/tabs_carat.png \
   res/drawable-large-mdpi-v11/tabs_carat_contracted.png \
   res/drawable-large-mdpi-v11/tabs_carat_expanded.png \
-  res/drawable-large-mdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_HDPI_V11 = \
@@ -922,7 +915,6 @@ RES_DRAWABLE_LARGE_HDPI_V11 = \
   res/drawable-large-hdpi-v11/tabs_carat.png \
   res/drawable-large-hdpi-v11/tabs_carat_contracted.png \
   res/drawable-large-hdpi-v11/tabs_carat_expanded.png \
-  res/drawable-large-hdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_XHDPI_V11 = \
@@ -932,7 +924,6 @@ RES_DRAWABLE_LARGE_XHDPI_V11 = \
   res/drawable-large-xhdpi-v11/tabs_carat.png \
   res/drawable-large-xhdpi-v11/tabs_carat_contracted.png \
   res/drawable-large-xhdpi-v11/tabs_carat_expanded.png \
-  res/drawable-large-xhdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_MDPI_V11 = \
@@ -967,10 +958,8 @@ RES_COLOR = \
 RES_MENU = \
   res/menu/awesomebar_contextmenu.xml \
   res/menu/gecko_app_menu.xml \
-  res/menu/tabs_menu.xml \
   res/menu/titlebar_contextmenu.xml \
   res/menu/abouthome_topsites_contextmenu.xml \
-  res/menu-v11/tabs_menu.xml \
   $(NULL)
 
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
diff --git a/mobile/android/base/TabsPanel.java b/mobile/android/base/TabsPanel.java
index 9b3dcffc472..8cbac4a090e 100644
--- a/mobile/android/base/TabsPanel.java
+++ b/mobile/android/base/TabsPanel.java
@@ -27,8 +27,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 public class TabsPanel extends LinearLayout
-                       implements GeckoPopupMenu.OnMenuItemClickListener,
-                                  LightweightTheme.OnChangeListener,
+                       implements LightweightTheme.OnChangeListener,
                                   IconTabWidget.OnTabChangedListener {
     private static final String LOGTAG = "GeckoTabsPanel";
 
@@ -61,16 +60,12 @@ public class TabsPanel extends LinearLayout
     private TabsLayoutChangeListener mLayoutChangeListener;
 
     private IconTabWidget mTabWidget;
-    private static ImageButton mMenuButton;
     private static ImageButton mAddTab;
 
     private Panel mCurrentPanel;
     private boolean mIsSideBar;
     private boolean mVisible;
 
-    private GeckoPopupMenu mPopupMenu;
-    private Menu mMenu;
-
     public TabsPanel(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
@@ -85,11 +80,6 @@ public class TabsPanel extends LinearLayout
 
         mIsSideBar = false;
 
-        mPopupMenu = new GeckoPopupMenu(context);
-        mPopupMenu.inflate(R.menu.tabs_menu);
-        mPopupMenu.setOnMenuItemClickListener(this);
-        mMenu = mPopupMenu.getMenu();
-
         LayoutInflater.from(context).inflate(R.layout.tabs_panel, this);
         initialize();
     }
@@ -120,15 +110,6 @@ public class TabsPanel extends LinearLayout
         mTabWidget.addTab(R.drawable.tabs_private);
         mTabWidget.addTab(R.drawable.tabs_synced);
         mTabWidget.setTabSelectionListener(this);
-
-        mMenuButton = (ImageButton) findViewById(R.id.menu);
-        mMenuButton.setOnClickListener(new Button.OnClickListener() {
-            public void onClick(View view) {
-                TabsPanel.this.openTabsMenu();
-            }
-        });
-
-        mPopupMenu.setAnchor(mMenuButton);
     }
 
     public void addTab() {
@@ -140,15 +121,6 @@ public class TabsPanel extends LinearLayout
         mActivity.autoHideTabs();
     }
 
-    public void openTabsMenu() {
-        if (mCurrentPanel == Panel.REMOTE_TABS)
-            mMenu.findItem(R.id.close_all_tabs).setEnabled(false);
-        else
-            mMenu.findItem(R.id.close_all_tabs).setEnabled(true); 
-
-        mPopupMenu.show();
-    }
-
     @Override
     public void onTabChanged(int index) {
         if (index == 0)
@@ -159,25 +131,6 @@ public class TabsPanel extends LinearLayout
             show(Panel.REMOTE_TABS, false);
     }
 
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.close_all_tabs:
-                for (Tab tab : Tabs.getInstance().getTabsInOrder()) {
-                    Tabs.getInstance().closeTab(tab);
-                }
-                autoHidePanel();
-                return true;
-
-            case R.id.new_tab:
-            case R.id.new_private_tab:
-                hide();
-            // fall through
-            default:
-                return mActivity.onOptionsItemSelected(item);
-        }
-    }
-
     private static int getTabContainerHeight(TabsListContainer listContainer) {
         Context context = listContainer.getContext();
 
@@ -357,14 +310,12 @@ public class TabsPanel extends LinearLayout
                 mFooter.setVisibility(View.GONE);
 
             mAddTab.setVisibility(View.INVISIBLE);
-            mMenuButton.setVisibility(View.INVISIBLE);
         } else {
             if (mFooter != null)
                 mFooter.setVisibility(View.VISIBLE);
 
             mAddTab.setVisibility(View.VISIBLE);
             mAddTab.setImageLevel(index);
-            mMenuButton.setVisibility(View.VISIBLE);
         }
 
         if (shouldResize) {
@@ -382,7 +333,6 @@ public class TabsPanel extends LinearLayout
     public void hide() {
         if (mVisible) {
             mVisible = false;
-            mPopupMenu.dismiss();
             dispatchLayoutChange(0, 0);
 
             if (mPanel != null) {
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab_small.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab_small.png
deleted file mode 100644
index d9bb94084f782a0e40df286325a99365138162ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`1|-Ad1@1F2Fy?!@IEGZ*dV71L*Wmz(qaRy#
zyj+qU{!x@AeEK(4nUaFnVO&-}S$36Aa1s|kXntYs<mL;pnmcFnbu9|A?=NWcev#n8
zV*gI^-;$qs?>;n7+p_fR8J(Lg;&BxZTgB~C|J?icF#d|Gs!>?cw5>Pnj|#`F^kL0E
zEd-RVzx8mV!|sfhcNfL`r@vs-t+0Dk%KANb_fcU}Xa5sfUry9=pZ{T=!dvyRhyUU&
z?Oo32Pk$@2bC$oj=1b51hcyk?ETf&nKibV(UsTJ?Yq9@ZkNu-RBBB>-R&UBTj*50n
zpEJMWSoxyswGPQ8J-?>b)}A}Q=iH9<kHyZn#jL(Pf$jPaCf}?>=L6r#oi8eBShnZ+
z{?8v-ce&1=<6jxOZu|B_-1>Vy9QrRLUw`w(8lh6@hqi}q{|QN-Cv10dd2L45`-Kk#
z?A&edzJmG`>|F%0Z>zjqd&q~Y`mWFCr0OoSm*xPO1~fADzJBVqcdLy)Tmi-agQu&X
J%Q~loCIGnZ%j*CD

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab_small.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab_small.png
deleted file mode 100644
index 03d042fa93aa96a40b54143ee512d5f141b21f99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`1|-Ad1?~f>6`n4RAr-gY-Ztc7Rupi!xOZN4
zr$}behXu!H_y`Id3cKiVB>YcRg#t&joZ!aX4`5*ZIRE=`eXYo|k7CcBdLmih{r*GT
zT~_(<gNM;Ueee6z$BwRwlsr`aW75^Ynl&<imL1>M`{?`{U5@&+<*WJR&_Ug;!;iOd
q|2uQ*`KH28Jo9-UJOqKq6^#41yq4q(>%9fKnZeW5&t;ucLK6U3=4JN)

diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_menu.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_menu.png
deleted file mode 100644
index fd36e743446db030757f523827c02126a454f312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBY&~5ZLn>~)y}FQ-!GVYQ!2SAW
zzu9>KffXw(1nZSl^iQs2_{(xtL;(oAd6!&qaBx`1?6I=3p&^F-f*SA6b5n|zyQZfB
P4Px+g^>bP0l+XkKIU^&~

diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/tabs_menu.png b/mobile/android/base/resources/drawable-large-mdpi-v11/tabs_menu.png
deleted file mode 100644
index 1c1b42cd78a1e0c3341ffcd21b7ece54236f20b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjdY&$hAr-gYURub@z`$|9;NSm-
z?Dpf%3NvS{i)2_lmvNK&2lj$sM)Oi2j%DO}f8<%-zAiIapiTx)S3j3^P6<r_j;|kx

diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_menu.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_menu.png
deleted file mode 100644
index c45f8c671cbbc41f8510e44ea40c57bc021fb8fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCA5Ry@kcwMxuWjUIaNuCxc)y-`
z8Lzg&E_XenhS@LTCaq^L;0>6}2vi9K9-KhJ9Aq8?gMuoM*dqXDH_QQ=cw;T&f_F0?
TrC2Nq0SS7#`njxgN@xNA(##+P

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab_small.png b/mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab_small.png
deleted file mode 100644
index 8242f7fb4a14af965b321b677021adcf129bddd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*40002{Nkl<Zc-rmR
zu}Z^G6o>IXgk9=bUqT;3mu?jV<6wQ7<Xt+7lEK|V5jVj>LE5ED+e`5D8_tkHf&uZQ
z<v;wmaB~UYaxdYgXJ&grq2Zxd*=>^?mCJv4-kHz@bE(UrR=2OABOK!rQ!KE;laC9Z
zA7g+~RH(HT6}oI0x{L~)VUBYg;RY4V$7}R);p?8GLJNH0wDzt?7#?bKXZS=B6?%dV
z%!5mO!F()z-hACKB-Gu(eqj=Rjv~V=)_B7`-m$?8G9CB|Rp@_(`Zwej7Ho^WDfAoG
z5!FG27D%vQ359mOLKUh|g(_5`3RS2sa{u^hTt6EW+SU#(BCPi-*`KKZ0000<MNUMn
GLSTY5H-^0c

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab_small.png b/mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab_small.png
deleted file mode 100644
index 2d1453d1ccb8afffdc5446dd3de1a677c2f10dbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^S|H591|*LjJ{b+9$~;{hLn>~)y=lmGK!L~Y;k_-+
z)8*XzvnTvJ`{06Oi_^i7dmonR+*k70<oV0hVY&17$1+p*-13@RDY2q5D>7xpJVsV7
z5siQa4vp)0bL&q$$}BqSt^DGtrbj7f#y1^?OMA|&W``<ZN}c%oW7eEx<_p{Jn&10&
Vk#&~P9H0vrJYD@<);T3K0RZP?MZ^FA

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab_small.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab_small.png
deleted file mode 100644
index 698f8e17618e771b0a54129be2b7056bfad5dc95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 637
zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r9PWFu8cTIEGZ*dVAN<TRKtZ_(!jH
zzC}$F4tjdK#yeS+zF61Ml)XUf#>xlJ7A$pQ<<?W}5^-JAx=3jslY4x_g&iU+f!<4&
zx;YAo%h%8NKS8dX-EtlK+t0H5PT&3C_d!vyod4mc6PE6p&ukeMG%$HJ{A*s&y7A<i
z?C|)jTZ^u3&CNdlW9uLB1*=cFZsE%K9Gc{y-C#Dqn>)aPk#$R)UP^R#)xxkV6IZR0
z{_3l{f`3)Y?NzT%q{Xi~u9Y$IGuxE}wvg$kR)2rxva@CG>dL9xi}_YL&v%Fw`^ge@
zmSM{y;TP|D9O{3uRLx<0Q9j>+pQ%{YbltAd^;K)nJ>J)n^K7Q9@j|c0nYHsB>`l+`
zxSz2J4Oe`=C&X6pIFH#G(OM?itQnErGov{zpBJ6^Q+4>x3jYQEOz-!_P7T*>+_`Z=
z@jkAdiWTd&F?)Bcz1I*`toV6(mcQ<*%&n3}n-hPF<$g0sNjrGF`e#__vY1n`EBxL&
ztQ9PsuJmlK)VJELFJrqFY}UDdb#~BpPsO)4%-6L4i`=iZ$~iR5^s94ipz*7<w*vR)
z#NSM_UuAdyx^rX#n+PaSV8nl+6@S?_uh2R*aaFX=%55qOqFEUh|C+<HC5%CDRn+GN
z3y!j7occJ?f4fw?*UN1)zii6%j1^_5IiWKxR9gJo9Zg0q4Pbl_NqjnyAeY6Pak+HG
w+5?Yu^KzrF^~XN%XZ*38)qxY}sIU8~6;6sPN5A&E1WZ;8p00i_>zopr0M+IefB*mh

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab_small.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab_small.png
deleted file mode 100644
index 764c9de091e515763c323374e482c8c7b337e05a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 327
zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r9PWF!Fi2IEGZ*dV6;xSCfOpfsb(u
zs*XrURV~QLTBTTHUA*b#FAiDJDTi0o9hN`hS*I|spl16?%hd_>{0t%*0gQj0E|gfT
zyQ{a$J$K6QTmSCmJx%|~dBJ;%`!0sL@y3j|faE+bjerFXjZCauKn?gAVhnG;C(LV$
zEvUNg61pXpDN4N|Id*zO8RwmdyEOqBlNojAgzw9l+aGi@&wILW=ob%$cDaj|x1w(R
z4rU^3I>ZIa&AeOLtajIixSwa-w11twLD}7d41Q4zT0p1$tJODt>TGtQRT3CJ3=E#G
KelF{r5}E)Bo^%8N

diff --git a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
index 41bba53d8c1..364dad861af 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
@@ -6,23 +6,12 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ImageButton android:id="@+id/add_tab"
-                 android:layout_width="@dimen/browser_toolbar_height"
+                 android:layout_width="fill_parent"
                  android:layout_height="@dimen/browser_toolbar_height"
                  android:padding="14dip"
                  android:src="@drawable/tab_new_level"
                  android:contentDescription="@string/new_tab"
-                 android:background="@drawable/action_bar_button"/>
-
-    <View android:layout_width="0dip"
-          android:layout_height="@dimen/browser_toolbar_height"
-          android:layout_weight="1.0"/>
-
-    <ImageButton android:id="@+id/menu"
-                 android:layout_width="@dimen/browser_toolbar_height"
-                 android:layout_height="@dimen/browser_toolbar_height"
-                 android:padding="14dip"
-                 android:src="@drawable/tabs_menu"
-                 android:contentDescription="@string/menu"
-                 android:background="@drawable/action_bar_button"/>
+                 android:background="@drawable/action_bar_button"
+                 android:gravity="center"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/tabs_panel_header.xml b/mobile/android/base/resources/layout/tabs_panel_header.xml
index b754aa7082f..167fadad53a 100644
--- a/mobile/android/base/resources/layout/tabs_panel_header.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_header.xml
@@ -24,13 +24,4 @@
                  android:contentDescription="@string/new_tab"
                  android:background="@drawable/action_bar_button"/>
 
-    <ImageButton android:id="@+id/menu"
-                 style="@style/AddressBar.ImageButton"
-                 android:layout_width="@dimen/browser_toolbar_height"
-                 android:layout_height="@dimen/browser_toolbar_height"
-                 android:padding="@dimen/browser_toolbar_button_padding"
-                 android:src="@drawable/menu"
-                 android:contentDescription="@string/menu"
-                 android:background="@drawable/action_bar_button"/>
-
 </merge>
diff --git a/mobile/android/base/resources/menu-v11/tabs_menu.xml b/mobile/android/base/resources/menu-v11/tabs_menu.xml
deleted file mode 100644
index 7809faa450c..00000000000
--- a/mobile/android/base/resources/menu-v11/tabs_menu.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/new_tab"
-          android:icon="@drawable/ic_menu_new_tab"
-          android:title="@string/new_tab"/>
-
-    <item android:id="@+id/new_private_tab"
-          android:icon="@drawable/ic_menu_new_private_tab"
-          android:title="@string/new_private_tab"/>
-
-    <item android:id="@+id/close_all_tabs"
-          android:icon="@drawable/ic_menu_close_all_tabs"
-          android:title="@string/close_all_tabs"/>
-
-</menu>
diff --git a/mobile/android/base/resources/menu/tabs_menu.xml b/mobile/android/base/resources/menu/tabs_menu.xml
deleted file mode 100644
index 56d272a5eb3..00000000000
--- a/mobile/android/base/resources/menu/tabs_menu.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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/. -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/new_tab"
-          android:icon="@drawable/ic_menu_new_tab_small"
-          android:title="@string/new_tab"/>
-
-    <item android:id="@+id/new_private_tab"
-          android:icon="@drawable/ic_menu_new_private_tab_small"
-          android:title="@string/new_private_tab"/>
-
-    <item android:id="@+id/close_all_tabs"
-          android:icon="@drawable/ic_menu_close_all_tabs"
-          android:title="@string/close_all_tabs"/>
-
-</menu>

From 77c149b73d967feb9019d89e0735554b50bb950e Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Mon, 25 Feb 2013 13:46:56 -0800
Subject: [PATCH 43/64] Bug 845021: Add size_t cast in assertion, to silence
 build warning, in ObjectWrapperChild::AnswerNewEnumerateNext. r=Waldo

---
 js/ipc/ObjectWrapperChild.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ipc/ObjectWrapperChild.cpp b/js/ipc/ObjectWrapperChild.cpp
index 86c90bd8085..9c9077c3199 100644
--- a/js/ipc/ObjectWrapperChild.cpp
+++ b/js/ipc/ObjectWrapperChild.cpp
@@ -480,7 +480,7 @@ ObjectWrapperChild::AnswerNewEnumerateNext(const JSVariant& in_state,
 
     int32_t i = JSVAL_TO_INT(v);
     NS_ASSERTION(i >= 0, "Index of next jsid negative?");
-    NS_ASSERTION(i <= strIds->Length(), "Index of next jsid too large?");
+    NS_ASSERTION(size_t(i) <= strIds->Length(), "Index of next jsid too large?");
 
     if (size_t(i) == strIds->Length()) {
         *status = JS_TRUE;

From 48eb0c311a56f6c60fc644cae810668a636e6905 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Mon, 25 Feb 2013 20:39:15 +0100
Subject: [PATCH 44/64] Fix for bug 844559 (Crash [@
 mozilla::dom::XrayResolveNativeProperty]). r=bz.

--HG--
extra : rebase_source : 85b3d0ee270f24847b9425cda9f8b56a494f2546
---
 dom/base/crashtests/844559.html               |  3 +++
 dom/base/crashtests/crashtests.list           |  1 +
 dom/bindings/Codegen.py                       | 20 +++++++++++++++++--
 .../chrome/test_sandbox_bindings.xul          |  7 +++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 dom/base/crashtests/844559.html

diff --git a/dom/base/crashtests/844559.html b/dom/base/crashtests/844559.html
new file mode 100644
index 00000000000..f03cfaa771d
--- /dev/null
+++ b/dom/base/crashtests/844559.html
@@ -0,0 +1,3 @@
+<script>
+Components.lookupMethod(Image, "x")
+</script>
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index 922b0b83301..a0514b3985e 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -39,3 +39,4 @@ load 697643.html
 load 706283-1.html
 load 708405-1.html
 load 745495.html
+load 844559.html
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 55a3a5e07e4..8e1c9183fef 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -1000,14 +1000,30 @@ class CGNamedConstructors(CGThing):
     def define(self):
         if len(self.descriptor.interface.namedConstructors) == 0:
             return ""
+
+        constructorID = "constructors::id::"
+        if self.descriptor.interface.hasInterfaceObject():
+            constructorID += self.descriptor.name
+        else:
+            constructorID += "_ID_Count"
+        nativePropertyHooks = """const NativePropertyHooks sNamedConstructorNativePropertyHooks = {
+    nullptr,
+    nullptr,
+    { nullptr, nullptr },
+    prototypes::id::%s,
+    %s,
+    nullptr
+};
+
+""" % (self.descriptor.name, constructorID)
         namedConstructors = CGList([], ",\n")
         for n in self.descriptor.interface.namedConstructors:
-            namedConstructors.append(CGGeneric("{ \"%s\", { %s, nullptr }, %i }" % (n.identifier.name, NamedConstructorName(n), methodLength(n))))
+            namedConstructors.append(CGGeneric("{ \"%s\", { %s, &sNamedConstructorNativePropertyHooks }, %i }" % (n.identifier.name, NamedConstructorName(n), methodLength(n))))
         namedConstructors.append(CGGeneric("{ nullptr, { nullptr, nullptr }, 0 }"))
         namedConstructors = CGWrapper(CGIndenter(namedConstructors),
                                       pre="static const NamedConstructor namedConstructors[] = {\n",
                                       post="\n};\n")
-        return namedConstructors.define()
+        return nativePropertyHooks + namedConstructors.define()
 
 class CGClassHasInstanceHook(CGAbstractStaticMethod):
     def __init__(self, descriptor):
diff --git a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
index 256510774b0..6fa86267828 100644
--- a/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
+++ b/dom/tests/mochitest/chrome/test_sandbox_bindings.xul
@@ -49,6 +49,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=741267
       } catch (e) {
         ok(false, "'XMLHttpRequest.prototype' shouldn't throw in a sandbox");
       }
+      try {
+        var img = Components.utils.evalInSandbox("Image.prototype", sandbox);
+        ok(img, "'Image.prototype' in a sandbox should return the interface prototype object");
+        ok(isXrayWrapper(img), "Getting an interface prototype object on an Xray wrapper should return an Xray wrapper");
+      } catch (e) {
+        ok(false, "'Image.prototype' shouldn't throw in a sandbox");
+      }
       try {
         var xhr = Components.utils.evalInSandbox("XMLHttpRequest", sandbox);
         xhr.prototype = false;

From 43540aa59a734392ab205dd01d502752ee72b223 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:17 -0800
Subject: [PATCH 45/64] Bug 836301 - Assert against JSID_VOID in JSID wrapping.
 r=mrbkap

Luke explained to me that it should never get there.
---
 js/src/jscompartment.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 680dd096ef0..a3c349c4d52 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -432,6 +432,7 @@ JSCompartment::wrap(JSContext *cx, JSObject **objp, JSObject *existingArg)
 bool
 JSCompartment::wrapId(JSContext *cx, jsid *idp)
 {
+    MOZ_ASSERT(*idp != JSID_VOID, "JSID_VOID is an out-of-band sentinel value");
     if (JSID_IS_INT(*idp))
         return true;
     RootedValue value(cx, IdToValue(*idp));

From 6f2c3cdc974fb4e4189fb7aece4795f23f362e46 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:17 -0800
Subject: [PATCH 46/64] Bug 836301 - Stop using JSRESOLVE_ASSIGNING to
 determine GET vs SET. r=mrbkap

This is just a heuristic, anyway, and some of the usage is downright broken.
There are two cases here:

1 - Deciding what to do for get{Own,}PropertyDescriptor. In these cases, we can
just enter with GET and rely on the filtering machinery to filter out dangerous
setters for security wrappers.

2 - Custom Xray props. None of these make sense in a |set| context. In fact,
    they generally have null setters anyway, so we can just assume GET.

The policy-entering code in XrayWrapper is super haphazard. We'll get rid of it
entirely later in these patches.
---
 js/src/jswrapper.cpp                  |  3 +--
 js/xpconnect/wrappers/XrayWrapper.cpp | 17 +++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index b05bbde51df..cc06c67893d 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -151,8 +151,7 @@ Wrapper::getPropertyDescriptor(JSContext *cx, JSObject *wrapperArg,
     RootedObject wrapper(cx, wrapperArg);
     JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
     desc->obj = NULL; // default result if we refuse to perform this action
-    CHECKED(DirectProxyHandler::getPropertyDescriptor(cx, wrapper, id, desc, flags),
-            (flags & JSRESOLVE_ASSIGNING) ? SET : GET);
+    CHECKED(DirectProxyHandler::getPropertyDescriptor(cx, wrapper, id, desc, flags), GET);
 }
 
 bool
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index a3d0610c5c5..7797723fdc9 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -726,8 +726,7 @@ XPCWrappedNativeXrayTraits::resolveNativeProperty(JSContext *cx, JSObject *wrapp
 {
     MOZ_ASSERT(js::GetObjectJSClass(holder) == &HolderClass);
     XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
-    if (!(flags & JSRESOLVE_ASSIGNING) &&
-        id == rt->GetStringID(XPCJSRuntime::IDX_MOZMATCHESSELECTOR) &&
+    if (id == rt->GetStringID(XPCJSRuntime::IDX_MOZMATCHESSELECTOR) &&
         Is<nsIDOMElement>(wrapper))
     {
         // XPC calling mechanism cannot handle call/bind properly in some cases
@@ -986,9 +985,8 @@ XPCWrappedNativeXrayTraits::resolveOwnProperty(JSContext *cx, js::Wrapper &jsWra
           (id == rt->GetStringID(XPCJSRuntime::IDX_DOCUMENTURIOBJECT) &&
           Is<nsIDocument>(wrapper)))) {
         bool status;
-        Wrapper::Action action = (flags & JSRESOLVE_ASSIGNING) ? Wrapper::SET : Wrapper::GET;
         desc->obj = NULL; // default value
-        if (!jsWrapper.enter(cx, wrapper, id, action, &status))
+        if (!jsWrapper.enter(cx, wrapper, id, Wrapper::GET, &status))
             return status;
 
         desc->obj = wrapper;
@@ -1410,9 +1408,8 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, JSObject *wrappe
     }
 
     bool status;
-    Wrapper::Action action = (flags & JSRESOLVE_ASSIGNING) ? Wrapper::SET : Wrapper::GET;
     desc->obj = NULL; // default value
-    if (!this->enter(cx, wrapper, id, action, &status))
+    if (!this->enter(cx, wrapper, id, Wrapper::GET, &status))
         return status;
 
     typename Traits::ResolvingIdImpl resolving(wrapper, id);
@@ -1441,9 +1438,8 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, JSObject *wrappe
     if (AccessCheck::wrapperSubsumes(wrapper) &&
         id == rt->GetStringID(XPCJSRuntime::IDX_WRAPPED_JSOBJECT)) {
         bool status;
-        Wrapper::Action action = (flags & JSRESOLVE_ASSIGNING) ? Wrapper::SET : Wrapper::GET;
         desc->obj = NULL; // default value
-        if (!this->enter(cx, wrapper, id, action, &status))
+        if (!this->enter(cx, wrapper, id, Wrapper::GET, &status))
             return status;
 
         desc->obj = wrapper;
@@ -1540,9 +1536,8 @@ XrayWrapper<Base, Traits>::getOwnPropertyDescriptor(JSContext *cx, JSObject *wra
     }
 
     bool status;
-    Wrapper::Action action = (flags & JSRESOLVE_ASSIGNING) ? Wrapper::SET : Wrapper::GET;
     desc->obj = NULL; // default value
-    if (!this->enter(cx, wrapper, id, action, &status))
+    if (!this->enter(cx, wrapper, id, Wrapper::GET, &status))
         return status;
 
     typename Traits::ResolvingIdImpl resolving(wrapper, id);
@@ -1596,6 +1591,8 @@ XrayWrapper<Base, Traits>::defineProperty(JSContext *cx, JSObject *wrapper, jsid
                                      desc->attrs);
     }
 
+    // NB: We still need JSRESOLVE_ASSIGNING here for the time being, because it
+    // tells things like nodelists whether they should create the property or not.
     PropertyDescriptor existing_desc;
     if (!getOwnPropertyDescriptor(cx, wrapper, id, &existing_desc, JSRESOLVE_ASSIGNING))
         return false;

From a1a88275ee740752ce5886c3f830c8591bb85a75 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:17 -0800
Subject: [PATCH 47/64] Bug 836301 - Add Special handling to allow us to call
 enter() for defineProperty on Xrays. r=mrbkap

---
 js/xpconnect/wrappers/FilteringWrapper.cpp | 16 ++++++++++++++++
 js/xpconnect/wrappers/XrayWrapper.cpp      | 13 +++++++++++++
 js/xpconnect/wrappers/XrayWrapper.h        |  3 +++
 3 files changed, 32 insertions(+)

diff --git a/js/xpconnect/wrappers/FilteringWrapper.cpp b/js/xpconnect/wrappers/FilteringWrapper.cpp
index da60024ffa2..fd4e81de9e5 100644
--- a/js/xpconnect/wrappers/FilteringWrapper.cpp
+++ b/js/xpconnect/wrappers/FilteringWrapper.cpp
@@ -129,6 +129,22 @@ bool
 FilteringWrapper<Base, Policy>::enter(JSContext *cx, JSObject *wrapper, jsid id,
                                       Wrapper::Action act, bool *bp)
 {
+    // This is a super ugly hacky to get around Xray Resolve wonkiness.
+    //
+    // Basically, XPCWN Xrays sometimes call into the Resolve hook of the
+    // scriptable helper, and pass the wrapper itself as the object upon which
+    // the resolve is happening. Then, special handling happens in
+    // XrayWrapper::defineProperty to detect the resolve and redefine the
+    // property on the holder. Really, we should just pass the holder itself to
+    // NewResolve, but there's too much code in nsDOMClassInfo that assumes this
+    // isn't the case (in particular, code expects to be able to look up
+    // properties on the object, which doesn't work for the holder). Given that
+    // these hooks are going away eventually with the new DOM bindings, let's
+    // just hack around this for now.
+    if (XrayUtils::IsXrayResolving(cx, wrapper, id)) {
+        *bp = true;
+        return true;
+    }
     if (!Policy::check(cx, wrapper, id, act)) {
         if (JS_IsExceptionPending(cx)) {
             *bp = false;
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 7797723fdc9..e7b442873db 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1317,6 +1317,19 @@ GetNativePropertiesObject(JSContext *cx, JSObject *wrapper)
     return holder;
 }
 
+bool
+IsXrayResolving(JSContext *cx, JSObject *wrapper, jsid id)
+{
+    if (!WrapperFactory::IsXrayWrapper(wrapper) ||
+        GetXrayType(wrapper) != XrayForWrappedNative)
+    {
+        return false;
+    }
+    JSObject *holder =
+      XPCWrappedNativeXrayTraits::singleton.ensureHolder(cx, wrapper);
+    return XPCWrappedNativeXrayTraits::isResolving(cx, holder, id);
+}
+
 }
 
 static JSBool
diff --git a/js/xpconnect/wrappers/XrayWrapper.h b/js/xpconnect/wrappers/XrayWrapper.h
index b1f3f9ddd82..fb76135fa9a 100644
--- a/js/xpconnect/wrappers/XrayWrapper.h
+++ b/js/xpconnect/wrappers/XrayWrapper.h
@@ -38,6 +38,9 @@ IsTransparent(JSContext *cx, JSObject *wrapper, jsid id);
 JSObject *
 GetNativePropertiesObject(JSContext *cx, JSObject *wrapper);
 
+bool
+IsXrayResolving(JSContext *cx, JSObject *wrapper, jsid id);
+
 }
 
 class XrayTraits;

From 1c9777f5049f623ad6873f620ecb2a9e8dc66662 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:17 -0800
Subject: [PATCH 48/64] Bug 836301 - Stop enter()ing with CALL for nativeCall.
 r=mrbkap

This is kind of nonsensical, because CALL means "the wrapped object is being
called", whereas nativeCall means "the wrapped object is being unwrapped to
have a JSNative invoked on it", which are two very different things.

We _could_ add a NATIVECALL enter() trap, but our current policy enforcement
around nativeCall involves overriding the trap itself, so we wouldn't use it
for anything. So let's just get rid of it.
---
 js/src/jswrapper.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index cc06c67893d..b731278cd5b 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -306,9 +306,10 @@ Wrapper::construct(JSContext *cx, JSObject *wrapperArg, unsigned argc, Value *ar
 bool
 Wrapper::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args)
 {
-    const jsid id = JSID_VOID;
     RootedObject wrapper(cx, &args.thisv().toObject());
-    CHECKED(DirectProxyHandler::nativeCall(cx, test, impl, args), CALL);
+    // Note - we don't enter a policy here because our security architecture guards
+    // against nativeCall by overriding the trap itself in the right circumstances.
+    return DirectProxyHandler::nativeCall(cx, test, impl, args);
 }
 
 bool

From 97705ea7e1850ed5840a2ae08a39b2eb1687bb71 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:18 -0800
Subject: [PATCH 49/64] Bug 836301 - Add tracking for whether we have a
 non-trivial enter() trap. r=mrbkap

This will allow us to skip the virtual function call for non-security-wrapper
proxies, which are the cases where we care most about performance.
---
 js/src/jsproxy.cpp   | 3 ++-
 js/src/jsproxy.h     | 6 ++++++
 js/src/jswrapper.cpp | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 2cfb7cef514..7d431c9614d 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -51,7 +51,8 @@ GetFunctionProxyConstruct(UnrootedObject proxy)
 
 BaseProxyHandler::BaseProxyHandler(void *family)
   : mFamily(family),
-    mHasPrototype(false)
+    mHasPrototype(false),
+    mHasPolicy(false)
 {
 }
 
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 304f04a2a53..0bba56ef876 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -51,9 +51,11 @@ class JS_FRIEND_API(Wrapper);
 class JS_FRIEND_API(BaseProxyHandler) {
     void *mFamily;
     bool mHasPrototype;
+    bool mHasPolicy;
   protected:
     // Subclasses may set this in their constructor.
     void setHasPrototype(bool aHasPrototype) { mHasPrototype = aHasPrototype; }
+    void setHasPolicy(bool aHasPolicy) { mHasPolicy = aHasPolicy; }
 
   public:
     explicit BaseProxyHandler(void *family);
@@ -63,6 +65,10 @@ class JS_FRIEND_API(BaseProxyHandler) {
         return mHasPrototype;
     }
 
+    bool hasPolicy() {
+        return mHasPolicy;
+    }
+
     inline void *family() {
         return mFamily;
     }
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index b731278cd5b..305769f04da 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -838,6 +838,7 @@ SecurityWrapper<Base>::SecurityWrapper(unsigned flags)
   : Base(flags)
 {
     Base::setSafeToUnwrap(false);
+    BaseProxyHandler::setHasPolicy(true);
 }
 
 template <class Base>

From 15161f36d395bc0f4ea88afd6050ec83cd10a517 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:18 -0800
Subject: [PATCH 50/64] Bug 836301 - Hoist enter() into BaseProxyHandler.
 r=mrbkap

---
 js/src/jsproxy.cpp   |  8 ++++++++
 js/src/jsproxy.h     | 16 ++++++++++++++++
 js/src/jswrapper.cpp |  7 -------
 js/src/jswrapper.h   | 17 +----------------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 7d431c9614d..daf9f1c397e 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -60,6 +60,14 @@ BaseProxyHandler::~BaseProxyHandler()
 {
 }
 
+bool
+BaseProxyHandler::enter(JSContext *cx, JSObject *wrapper, jsid id, Action act,
+                        bool *bp)
+{
+    *bp = true;
+    return true;
+}
+
 bool
 BaseProxyHandler::has(JSContext *cx, JSObject *proxy_, jsid id_, bool *bp)
 {
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 0bba56ef876..0d0b70e1e8b 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -77,6 +77,22 @@ class JS_FRIEND_API(BaseProxyHandler) {
         return false;
     }
 
+    /* Policy enforcement traps.
+     *
+     * enter() allows the policy to specify whether the caller may perform |act|
+     * on the proxy's |id| property. In the case when |act| is CALL, |id| is
+     * generally JSID_VOID.
+     *
+     * The |act| parameter to enter() specifies the action being performed.
+     */
+    enum Action {
+        GET,
+        SET,
+        CALL
+    };
+    virtual bool enter(JSContext *cx, JSObject *wrapper, jsid id, Action act,
+                       bool *bp);
+
     /* ES5 Harmony fundamental proxy traps. */
     virtual bool getPropertyDescriptor(JSContext *cx, JSObject *proxy, jsid id,
                                        PropertyDescriptor *desc, unsigned flags) = 0;
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 305769f04da..2fc1c947f07 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -70,13 +70,6 @@ Wrapper::wrappedObject(RawObject wrapper)
     return GetProxyTargetObject(wrapper);
 }
 
-bool
-Wrapper::enter(JSContext *cx, JSObject *wrapper, jsid id, Action act, bool *bp)
-{
-    *bp = true;
-    return true;
-}
-
 JS_FRIEND_API(JSObject *)
 js::UnwrapObject(JSObject *wrapped, bool stopAtOuter, unsigned *flagsp)
 {
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index 010b8e1414e..db03e9f55f4 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -32,11 +32,7 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
     bool mSafeToUnwrap;
 
   public:
-    enum Action {
-        GET,
-        SET,
-        CALL
-    };
+    using BaseProxyHandler::Action;
 
     enum Flags {
         CROSS_COMPARTMENT = 1 << 0,
@@ -65,17 +61,6 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
         return mFlags;
     }
 
-    /* Policy enforcement traps.
-     *
-     * enter() allows the policy to specify whether the caller may perform |act|
-     * on the underlying object's |id| property. In the case when |act| is CALL,
-     * |id| is generally JSID_VOID.
-     *
-     * The |act| parameter to enter() specifies the action being performed.
-     */
-    virtual bool enter(JSContext *cx, JSObject *wrapper, jsid id, Action act,
-                       bool *bp);
-
     explicit Wrapper(unsigned flags, bool hasPrototype = false);
 
     virtual ~Wrapper();

From 83a57c8d91aa1aca57b92d527771190d4fb39452 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:18 -0800
Subject: [PATCH 51/64] Bug 836301 - Introduce an RAII class for entering
 policies. r=mrbkap

This will allow us to make some hard assertions that a given policy has been
entered exactly once.
---
 js/src/js.msg                              |  4 ++--
 js/src/jsproxy.cpp                         | 14 +++++++++++++
 js/src/jsproxy.h                           | 24 ++++++++++++++++++++++
 js/src/jswrapper.cpp                       |  6 +++---
 js/xpconnect/wrappers/AccessCheck.cpp      | 18 ----------------
 js/xpconnect/wrappers/AccessCheck.h        | 24 +++++++---------------
 js/xpconnect/wrappers/FilteringWrapper.cpp |  7 +------
 7 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/js/src/js.msg b/js/src/js.msg
index 7b13a1cda09..c72d0952188 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -79,8 +79,8 @@ MSG_DEF(JSMSG_TOO_DEEP,                25, 1, JSEXN_INTERNALERR, "{0} nested too
 MSG_DEF(JSMSG_OVER_RECURSED,           26, 0, JSEXN_INTERNALERR, "too much recursion")
 MSG_DEF(JSMSG_IN_NOT_OBJECT,           27, 1, JSEXN_TYPEERR, "invalid 'in' operand {0}")
 MSG_DEF(JSMSG_BAD_NEW_RESULT,          28, 1, JSEXN_TYPEERR, "invalid new expression result {0}")
-MSG_DEF(JSMSG_UNUSED29,                29, 0, JSEXN_NONE, "")
-MSG_DEF(JSMSG_UNUSED30,                30, 0, JSEXN_NONE, "")
+MSG_DEF(JSMSG_OBJECT_ACCESS_DENIED,    29, 0, JSEXN_ERR, "Permission denied to access object")
+MSG_DEF(JSMSG_PROPERTY_ACCESS_DENIED,  30, 1, JSEXN_ERR, "Permission denied to access property '{0}'")
 MSG_DEF(JSMSG_BAD_INSTANCEOF_RHS,      31, 1, JSEXN_TYPEERR, "invalid 'instanceof' operand {0}")
 MSG_DEF(JSMSG_BAD_BYTECODE,            32, 1, JSEXN_INTERNALERR, "unimplemented JavaScript bytecode {0}")
 MSG_DEF(JSMSG_BAD_RADIX,               33, 0, JSEXN_RANGEERR, "radix must be an integer at least 2 and no greater than 36")
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index daf9f1c397e..ebdc57ba827 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -49,6 +49,20 @@ GetFunctionProxyConstruct(UnrootedObject proxy)
     return proxy->getSlotRef(JSSLOT_PROXY_CONSTRUCT);
 }
 
+void
+js::AutoEnterPolicy::reportError(JSContext *cx, jsid id)
+{
+    if (JSID_IS_VOID(id)) {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+                             JSMSG_OBJECT_ACCESS_DENIED);
+    } else {
+        JSString *str = IdToString(cx, id);
+        const jschar *prop = str ? str->getCharsZ(cx) : NULL;
+        JS_ReportErrorNumberUC(cx, js_GetErrorMessage, NULL,
+                               JSMSG_PROPERTY_ACCESS_DENIED, prop);
+    }
+}
+
 BaseProxyHandler::BaseProxyHandler(void *family)
   : mFamily(family),
     mHasPrototype(false),
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 0d0b70e1e8b..315fb9b01eb 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -84,6 +84,8 @@ class JS_FRIEND_API(BaseProxyHandler) {
      * generally JSID_VOID.
      *
      * The |act| parameter to enter() specifies the action being performed.
+     * If |bp| is false, the trap suggests that the caller throw (though it
+     * may still decide to squelch the error).
      */
     enum Action {
         GET,
@@ -341,6 +343,28 @@ NewProxyObject(JSContext *cx, BaseProxyHandler *handler, const Value &priv,
 JSObject *
 RenewProxyObject(JSContext *cx, JSObject *obj, BaseProxyHandler *handler, Value priv);
 
+class JS_FRIEND_API(AutoEnterPolicy)
+{
+  public:
+    typedef BaseProxyHandler::Action Action;
+    AutoEnterPolicy(JSContext *cx, BaseProxyHandler *handler,
+                    JSObject *wrapper, jsid id, Action act, bool mayThrow)
+    {
+        allow = handler->hasPolicy() ? handler->enter(cx, wrapper, id, act, &rv)
+                                     : true;
+        if (!allow && !rv && mayThrow)
+            reportError(cx, id);
+    }
+
+    inline bool allowed() { return allow; }
+    inline bool returnValue() { JS_ASSERT(!allowed()); return rv; }
+
+  protected:
+    void reportError(JSContext *cx, jsid id);
+    bool allow;
+    bool rv;
+};
+
 } /* namespace js */
 
 extern JS_FRIEND_API(JSObject *)
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 2fc1c947f07..0d4899e8d3f 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -117,9 +117,9 @@ js::IsCrossCompartmentWrapper(RawObject wrapper)
 
 #define CHECKED(op, act)                                                     \
     JS_BEGIN_MACRO                                                           \
-        bool status;                                                         \
-        if (!enter(cx, wrapper, id, act, &status))                           \
-            return status;                                                   \
+        AutoEnterPolicy policy(cx, this, wrapper, id, act, true);            \
+        if (!policy.allowed())                                               \
+            return policy.returnValue();                                     \
         return (op);                                                         \
     JS_END_MACRO
 
diff --git a/js/xpconnect/wrappers/AccessCheck.cpp b/js/xpconnect/wrappers/AccessCheck.cpp
index d5072d87499..3865c4aeb0f 100644
--- a/js/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/xpconnect/wrappers/AccessCheck.cpp
@@ -267,24 +267,6 @@ AccessCheck::isScriptAccessOnly(JSContext *cx, JSObject *wrapper)
     return false;
 }
 
-void
-AccessCheck::deny(JSContext *cx, jsid id)
-{
-    if (id == JSID_VOID) {
-        JS_ReportError(cx, "Permission denied to access object");
-    } else {
-        jsval idval;
-        if (!JS_IdToValue(cx, id, &idval))
-            return;
-        JSString *str = JS_ValueToString(cx, idval);
-        if (!str)
-            return;
-        const jschar *chars = JS_GetStringCharsZ(cx, str);
-        if (chars)
-            JS_ReportError(cx, "Permission denied to access property '%hs'", chars);
-    }
-}
-
 enum Access { READ = (1<<0), WRITE = (1<<1), NO_ACCESS = 0 };
 
 static bool
diff --git a/js/xpconnect/wrappers/AccessCheck.h b/js/xpconnect/wrappers/AccessCheck.h
index 8a7dcc5a5b4..dd95e040731 100644
--- a/js/xpconnect/wrappers/AccessCheck.h
+++ b/js/xpconnect/wrappers/AccessCheck.h
@@ -33,8 +33,6 @@ class AccessCheck {
     static bool needsSystemOnlyWrapper(JSObject *obj);
 
     static bool isScriptAccessOnly(JSContext *cx, JSObject *wrapper);
-
-    static void deny(JSContext *cx, jsid id);
 };
 
 struct Policy {
@@ -45,8 +43,7 @@ struct Opaque : public Policy {
     static bool check(JSContext *cx, JSObject *wrapper, jsid id, js::Wrapper::Action act) {
         return act == js::Wrapper::CALL;
     }
-    static bool deny(JSContext *cx, jsid id, js::Wrapper::Action act) {
-        AccessCheck::deny(cx, id);
+    static bool deny(js::Wrapper::Action act) {
         return false;
     }
     static bool allowNativeCall(JSContext *cx, JS::IsAcceptableThis test, JS::NativeImpl impl)
@@ -62,8 +59,7 @@ struct OnlyIfSubjectIsSystem : public Policy {
         return AccessCheck::isSystemOnlyAccessPermitted(cx);
     }
 
-    static bool deny(JSContext *cx, jsid id, js::Wrapper::Action act) {
-        AccessCheck::deny(cx, id);
+    static bool deny(js::Wrapper::Action act) {
         return false;
     }
 
@@ -79,8 +75,7 @@ struct CrossOriginAccessiblePropertiesOnly : public Policy {
     static bool check(JSContext *cx, JSObject *wrapper, jsid id, js::Wrapper::Action act) {
         return AccessCheck::isCrossOriginAccessPermitted(cx, wrapper, id, act);
     }
-    static bool deny(JSContext *cx, jsid id, js::Wrapper::Action act) {
-        AccessCheck::deny(cx, id);
+    static bool deny(js::Wrapper::Action act) {
         return false;
     }
     static bool allowNativeCall(JSContext *cx, JS::IsAcceptableThis test, JS::NativeImpl impl)
@@ -94,13 +89,9 @@ struct CrossOriginAccessiblePropertiesOnly : public Policy {
 struct ExposedPropertiesOnly : public Policy {
     static bool check(JSContext *cx, JSObject *wrapper, jsid id, js::Wrapper::Action act);
 
-    static bool deny(JSContext *cx, jsid id, js::Wrapper::Action act) {
-        // For gets, silently fail.
-        if (act == js::Wrapper::GET)
-            return true;
-        // For sets,throw an exception.
-        AccessCheck::deny(cx, id);
-        return false;
+    static bool deny(js::Wrapper::Action act) {
+        // Fail silently for GETs.
+        return act == js::Wrapper::GET;
     }
     static bool allowNativeCall(JSContext *cx, JS::IsAcceptableThis test, JS::NativeImpl impl);
 };
@@ -109,8 +100,7 @@ struct ExposedPropertiesOnly : public Policy {
 struct ComponentsObjectPolicy : public Policy {
     static bool check(JSContext *cx, JSObject *wrapper, jsid id, js::Wrapper::Action act);
 
-    static bool deny(JSContext *cx, jsid id, js::Wrapper::Action act) {
-        AccessCheck::deny(cx, id);
+    static bool deny(js::Wrapper::Action act) {
         return false;
     }
     static bool allowNativeCall(JSContext *cx, JS::IsAcceptableThis test, JS::NativeImpl impl) {
diff --git a/js/xpconnect/wrappers/FilteringWrapper.cpp b/js/xpconnect/wrappers/FilteringWrapper.cpp
index fd4e81de9e5..69c5a976b48 100644
--- a/js/xpconnect/wrappers/FilteringWrapper.cpp
+++ b/js/xpconnect/wrappers/FilteringWrapper.cpp
@@ -146,12 +146,7 @@ FilteringWrapper<Base, Policy>::enter(JSContext *cx, JSObject *wrapper, jsid id,
         return true;
     }
     if (!Policy::check(cx, wrapper, id, act)) {
-        if (JS_IsExceptionPending(cx)) {
-            *bp = false;
-            return false;
-        }
-        JSAutoCompartment ac(cx, wrapper);
-        *bp = Policy::deny(cx, id, act);
+        *bp = JS_IsExceptionPending(cx) ? false : Policy::deny(act);
         return false;
     }
     *bp = true;

From f84dddd71f01e6da291a2f46e6f903a19f6f7746 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:18 -0800
Subject: [PATCH 52/64] Bug 836301 - Hoist enter() calls from
 {Xray,}Wrapper::foo into Proxy::foo. r=mrbkap

---
 js/src/jsproxy.cpp                            | 141 +++++++++++++++---
 js/src/jswrapper.cpp                          |  80 ++--------
 js/xpconnect/tests/chrome/test_bug760109.xul  |  13 +-
 js/xpconnect/tests/unit/test_bug780370.js     |   5 +-
 js/xpconnect/wrappers/ChromeObjectWrapper.cpp |  79 +++++++---
 js/xpconnect/wrappers/ChromeObjectWrapper.h   |   3 +
 js/xpconnect/wrappers/XrayWrapper.cpp         |  23 +--
 7 files changed, 216 insertions(+), 128 deletions(-)

diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index ebdc57ba827..6998383c7a4 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -2200,7 +2200,6 @@ ScriptedDirectProxyHandler ScriptedDirectProxyHandler::singleton;
         return protoCall;                                                    \
     JS_END_MACRO                                                             \
 
-
 bool
 Proxy::getPropertyDescriptor(JSContext *cx, JSObject *proxy_, jsid id_, PropertyDescriptor *desc,
                              unsigned flags)
@@ -2209,6 +2208,10 @@ Proxy::getPropertyDescriptor(JSContext *cx, JSObject *proxy_, jsid id_, Property
     RootedObject proxy(cx, proxy_);
     RootedId id(cx, id_);
     BaseProxyHandler *handler = GetProxyHandler(proxy);
+    desc->obj = NULL; // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     if (!handler->hasPrototype())
         return handler->getPropertyDescriptor(cx, proxy, id, desc, flags);
     if (!handler->getOwnPropertyDescriptor(cx, proxy, id, desc, flags))
@@ -2241,7 +2244,12 @@ Proxy::getOwnPropertyDescriptor(JSContext *cx, JSObject *proxy_, jsid id, Proper
 {
     JS_CHECK_RECURSION(cx, return false);
     RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->getOwnPropertyDescriptor(cx, proxy, id, desc, flags);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+    desc->obj = NULL; // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
+    return handler->getOwnPropertyDescriptor(cx, proxy, id, desc, flags);
 }
 
 bool
@@ -2265,7 +2273,11 @@ bool
 Proxy::defineProperty(JSContext *cx, JSObject *proxy_, jsid id, PropertyDescriptor *desc)
 {
     JS_CHECK_RECURSION(cx, return false);
+    BaseProxyHandler *handler = GetProxyHandler(proxy_);
     RootedObject proxy(cx, proxy_);
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::SET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     return GetProxyHandler(proxy)->defineProperty(cx, proxy, id, desc);
 }
 
@@ -2284,7 +2296,11 @@ bool
 Proxy::getOwnPropertyNames(JSContext *cx, JSObject *proxy_, AutoIdVector &props)
 {
     JS_CHECK_RECURSION(cx, return false);
+    BaseProxyHandler *handler = GetProxyHandler(proxy_);
     RootedObject proxy(cx, proxy_);
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     return GetProxyHandler(proxy)->getOwnPropertyNames(cx, proxy, props);
 }
 
@@ -2292,7 +2308,12 @@ bool
 Proxy::delete_(JSContext *cx, JSObject *proxy_, jsid id, bool *bp)
 {
     JS_CHECK_RECURSION(cx, return false);
+    BaseProxyHandler *handler = GetProxyHandler(proxy_);
     RootedObject proxy(cx, proxy_);
+    *bp = true; // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::SET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     return GetProxyHandler(proxy)->delete_(cx, proxy, id, bp);
 }
 
@@ -2322,6 +2343,9 @@ Proxy::enumerate(JSContext *cx, JSObject *proxy_, AutoIdVector &props)
     JS_CHECK_RECURSION(cx, return false);
     RootedObject proxy(cx, proxy_);
     BaseProxyHandler *handler = GetProxyHandler(proxy);
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     if (!handler->hasPrototype())
         return GetProxyHandler(proxy)->enumerate(cx, proxy, props);
     if (!handler->keys(cx, proxy, props))
@@ -2339,6 +2363,10 @@ Proxy::has(JSContext *cx, JSObject *proxy_, jsid id_, bool *bp)
     RootedObject proxy(cx, proxy_);
     RootedId id(cx, id_);
     BaseProxyHandler *handler = GetProxyHandler(proxy);
+    *bp = false; // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     if (!handler->hasPrototype())
         return handler->has(cx, proxy, id, bp);
     if (!handler->hasOwn(cx, proxy, id, bp))
@@ -2356,7 +2384,12 @@ Proxy::hasOwn(JSContext *cx, JSObject *proxy_, jsid id, bool *bp)
 {
     JS_CHECK_RECURSION(cx, return false);
     RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->hasOwn(cx, proxy, id, bp);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+    *bp = false; // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
+    return handler->hasOwn(cx, proxy, id, bp);
 }
 
 bool
@@ -2365,6 +2398,10 @@ Proxy::get(JSContext *cx, HandleObject proxy, HandleObject receiver, HandleId id
 {
     JS_CHECK_RECURSION(cx, return false);
     BaseProxyHandler *handler = GetProxyHandler(proxy);
+    vp.setUndefined(); // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     bool own;
     if (!handler->hasPrototype()) {
         own = true;
@@ -2383,17 +2420,20 @@ Proxy::getElementIfPresent(JSContext *cx, HandleObject proxy, HandleObject recei
 {
     JS_CHECK_RECURSION(cx, return false);
 
-    BaseProxyHandler *handler = GetProxyHandler(proxy);
-
-    if (!handler->hasPrototype()) {
-        return GetProxyHandler(proxy)->getElementIfPresent(cx, proxy, receiver, index,
-                                                           vp.address(), present);
-    }
-
     RootedId id(cx);
     if (!IndexToId(cx, index, &id))
         return false;
 
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
+
+    if (!handler->hasPrototype()) {
+        return handler->getElementIfPresent(cx, proxy, receiver, index,
+                                            vp.address(), present);
+    }
+
     bool hasOwn;
     if (!handler->hasOwn(cx, proxy, id, &hasOwn))
         return false;
@@ -2413,6 +2453,9 @@ Proxy::set(JSContext *cx, HandleObject proxy, HandleObject receiver, HandleId id
 {
     JS_CHECK_RECURSION(cx, return false);
     BaseProxyHandler *handler = GetProxyHandler(proxy);
+    AutoEnterPolicy policy(cx, handler, proxy, id, BaseProxyHandler::SET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     if (handler->hasPrototype()) {
         // If we're using a prototype, we still want to use the proxy trap unless
         // we have a non-own property with a setter.
@@ -2440,7 +2483,11 @@ Proxy::keys(JSContext *cx, JSObject *proxy_, AutoIdVector &props)
 {
     JS_CHECK_RECURSION(cx, return false);
     RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->keys(cx, proxy, props);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
+    return handler->keys(cx, proxy, props);
 }
 
 bool
@@ -2448,8 +2495,19 @@ Proxy::iterate(JSContext *cx, HandleObject proxy, unsigned flags, MutableHandleV
 {
     JS_CHECK_RECURSION(cx, return false);
     BaseProxyHandler *handler = GetProxyHandler(proxy);
-    if (!handler->hasPrototype())
-        return GetProxyHandler(proxy)->iterate(cx, proxy, flags, vp.address());
+    vp.setUndefined(); // default result if we refuse to perform this action
+    if (!handler->hasPrototype()) {
+        AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID,
+                               BaseProxyHandler::GET, /* mayThrow = */ false);
+        // If the policy denies access but wants us to return true, we need
+        // to hand a valid (empty) iterator object to the caller.
+        if (!policy.allowed()) {
+            AutoIdVector props(cx);
+            return policy.returnValue() &&
+                   EnumeratedIdVectorToIterator(cx, proxy, flags, props, vp);
+        }
+        return handler->iterate(cx, proxy, flags, vp.address());
+    }
     AutoIdVector props(cx);
     // The other Proxy::foo methods do the prototype-aware work for us here.
     if ((flags & JSITER_OWNONLY)
@@ -2465,7 +2523,19 @@ Proxy::call(JSContext *cx, JSObject *proxy_, unsigned argc, Value *vp)
 {
     JS_CHECK_RECURSION(cx, return false);
     RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->call(cx, proxy, argc, vp);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+
+    // Because vp[0] is JS_CALLEE on the way in and JS_RVAL on the way out, we
+    // can only set our default value once we're sure that we're not calling the
+    // trap.
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID,
+                           BaseProxyHandler::CALL, true);
+    if (!policy.allowed()) {
+        vp->setUndefined();
+        return policy.returnValue();
+    }
+
+    return handler->call(cx, proxy, argc, vp);
 }
 
 bool
@@ -2473,7 +2543,19 @@ Proxy::construct(JSContext *cx, JSObject *proxy_, unsigned argc, Value *argv, Va
 {
     JS_CHECK_RECURSION(cx, return false);
     RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->construct(cx, proxy, argc, argv, rval);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+
+    // Because vp[0] is JS_CALLEE on the way in and JS_RVAL on the way out, we
+    // can only set our default value once we're sure that we're not calling the
+    // trap.
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID,
+                           BaseProxyHandler::CALL, true);
+    if (!policy.allowed()) {
+        rval->setUndefined();
+        return policy.returnValue();
+    }
+
+    return handler->construct(cx, proxy, argc, argv, rval);
 }
 
 bool
@@ -2481,6 +2563,9 @@ Proxy::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArg
 {
     JS_CHECK_RECURSION(cx, return false);
     Rooted<JSObject*> proxy(cx, &args.thisv().toObject());
+    // Note - we don't enter a policy here because our security architecture
+    // guards against nativeCall by overriding the trap itself in the right
+    // circumstances.
     return GetProxyHandler(proxy)->nativeCall(cx, test, impl, args);
 }
 
@@ -2488,6 +2573,11 @@ bool
 Proxy::hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v, bool *bp)
 {
     JS_CHECK_RECURSION(cx, return false);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+    *bp = false; // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID, BaseProxyHandler::GET, true);
+    if (!policy.allowed())
+        return policy.returnValue();
     return GetProxyHandler(proxy)->hasInstance(cx, proxy, v, bp);
 }
 
@@ -2503,7 +2593,14 @@ Proxy::obj_toString(JSContext *cx, JSObject *proxy_)
 {
     JS_CHECK_RECURSION(cx, return NULL);
     RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->obj_toString(cx, proxy);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID,
+                           BaseProxyHandler::GET, /* mayThrow = */ false);
+    // Do the safe thing if the policy rejects.
+    if (!policy.allowed()) {
+        return handler->BaseProxyHandler::obj_toString(cx, proxy);
+    }
+    return handler->obj_toString(cx, proxy);
 }
 
 JSString *
@@ -2511,7 +2608,17 @@ Proxy::fun_toString(JSContext *cx, JSObject *proxy_, unsigned indent)
 {
     JS_CHECK_RECURSION(cx, return NULL);
     RootedObject proxy(cx, proxy_);
-    return GetProxyHandler(proxy)->fun_toString(cx, proxy, indent);
+    BaseProxyHandler *handler = GetProxyHandler(proxy);
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOID,
+                           BaseProxyHandler::GET, /* mayThrow = */ false);
+    // Do the safe thing if the policy rejects.
+    if (!policy.allowed()) {
+        if (proxy->isCallable())
+            return JS_NewStringCopyZ(cx, "function () {\n    [native code]\n}");
+        ReportIsNotFunction(cx, ObjectValue(*proxy));
+        return NULL;
+    }
+    return handler->fun_toString(cx, proxy, indent);
 }
 
 bool
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 0d4899e8d3f..819b64a8b60 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -115,17 +115,6 @@ js::IsCrossCompartmentWrapper(RawObject wrapper)
            !!(Wrapper::wrapperHandler(wrapper)->flags() & Wrapper::CROSS_COMPARTMENT);
 }
 
-#define CHECKED(op, act)                                                     \
-    JS_BEGIN_MACRO                                                           \
-        AutoEnterPolicy policy(cx, this, wrapper, id, act, true);            \
-        if (!policy.allowed())                                               \
-            return policy.returnValue();                                     \
-        return (op);                                                         \
-    JS_END_MACRO
-
-#define SET(action) CHECKED(action, SET)
-#define GET(action) CHECKED(action, GET)
-
 Wrapper::Wrapper(unsigned flags, bool hasPrototype) : DirectProxyHandler(&sWrapperFamily)
                                                     , mFlags(flags)
                                                     , mSafeToUnwrap(true)
@@ -143,8 +132,7 @@ Wrapper::getPropertyDescriptor(JSContext *cx, JSObject *wrapperArg,
 {
     RootedObject wrapper(cx, wrapperArg);
     JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    desc->obj = NULL; // default result if we refuse to perform this action
-    CHECKED(DirectProxyHandler::getPropertyDescriptor(cx, wrapper, id, desc, flags), GET);
+    return DirectProxyHandler::getPropertyDescriptor(cx, wrapper, id, desc, flags);
 }
 
 bool
@@ -152,8 +140,7 @@ Wrapper::getOwnPropertyDescriptor(JSContext *cx, JSObject *wrapperArg,
                                   jsid id, PropertyDescriptor *desc, unsigned flags)
 {
     RootedObject wrapper(cx, wrapperArg);
-    desc->obj = NULL; // default result if we refuse to perform this action
-    CHECKED(DirectProxyHandler::getOwnPropertyDescriptor(cx, wrapper, id, desc, flags), GET);
+    return DirectProxyHandler::getOwnPropertyDescriptor(cx, wrapper, id, desc, flags);
 }
 
 bool
@@ -161,7 +148,7 @@ Wrapper::defineProperty(JSContext *cx, JSObject *wrapperArg, jsid id,
                         PropertyDescriptor *desc)
 {
     RootedObject wrapper(cx, wrapperArg);
-    SET(DirectProxyHandler::defineProperty(cx, wrapper, id, desc));
+    return DirectProxyHandler::defineProperty(cx, wrapper, id, desc);
 }
 
 bool
@@ -169,17 +156,14 @@ Wrapper::getOwnPropertyNames(JSContext *cx, JSObject *wrapperArg,
                              AutoIdVector &props)
 {
     RootedObject wrapper(cx, wrapperArg);
-    // if we refuse to perform this action, props remains empty
-    jsid id = JSID_VOID;
-    GET(DirectProxyHandler::getOwnPropertyNames(cx, wrapper, props));
+    return DirectProxyHandler::getOwnPropertyNames(cx, wrapper, props);
 }
 
 bool
 Wrapper::delete_(JSContext *cx, JSObject *wrapperArg, jsid id, bool *bp)
 {
     RootedObject wrapper(cx, wrapperArg);
-    *bp = true; // default result if we refuse to perform this action
-    SET(DirectProxyHandler::delete_(cx, wrapper, id, bp));
+    return DirectProxyHandler::delete_(cx, wrapper, id, bp);
 }
 
 bool
@@ -187,9 +171,7 @@ Wrapper::enumerate(JSContext *cx, JSObject *wrapperArg, AutoIdVector &props)
 {
     RootedObject wrapper(cx, wrapperArg);
     JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    // if we refuse to perform this action, props remains empty
-    static jsid id = JSID_VOID;
-    GET(DirectProxyHandler::enumerate(cx, wrapper, props));
+    return DirectProxyHandler::enumerate(cx, wrapper, props);
 }
 
 /*
@@ -231,24 +213,21 @@ Wrapper::has(JSContext *cx, JSObject *wrapperArg, jsid id, bool *bp)
 {
     RootedObject wrapper(cx, wrapperArg);
     JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    *bp = false; // default result if we refuse to perform this action
-    GET(DirectProxyHandler::has(cx, wrapper, id, bp));
+    return DirectProxyHandler::has(cx, wrapper, id, bp);
 }
 
 bool
 Wrapper::hasOwn(JSContext *cx, JSObject *wrapperArg, jsid id, bool *bp)
 {
     RootedObject wrapper(cx, wrapperArg);
-    *bp = false; // default result if we refuse to perform this action
-    GET(DirectProxyHandler::hasOwn(cx, wrapper, id, bp));
+    return DirectProxyHandler::hasOwn(cx, wrapper, id, bp);
 }
 
 bool
 Wrapper::get(JSContext *cx, JSObject *wrapperArg, JSObject *receiver, jsid id, Value *vp)
 {
     RootedObject wrapper(cx, wrapperArg);
-    vp->setUndefined(); // default result if we refuse to perform this action
-    GET(DirectProxyHandler::get(cx, wrapper, receiver, id, vp));
+    return DirectProxyHandler::get(cx, wrapper, receiver, id, vp);
 }
 
 bool
@@ -256,16 +235,14 @@ Wrapper::set(JSContext *cx, JSObject *wrapperArg, JSObject *receiver, jsid id, b
              Value *vp)
 {
     RootedObject wrapper(cx, wrapperArg);
-    SET(DirectProxyHandler::set(cx, wrapper, receiver, id, strict, vp));
+    return DirectProxyHandler::set(cx, wrapper, receiver, id, strict, vp);
 }
 
 bool
 Wrapper::keys(JSContext *cx, JSObject *wrapperArg, AutoIdVector &props)
 {
     RootedObject wrapper(cx, wrapperArg);
-    // if we refuse to perform this action, props remains empty
-    const jsid id = JSID_VOID;
-    GET(DirectProxyHandler::keys(cx, wrapper, props));
+    return DirectProxyHandler::keys(cx, wrapper, props);
 }
 
 bool
@@ -273,27 +250,21 @@ Wrapper::iterate(JSContext *cx, JSObject *wrapperArg, unsigned flags, Value *vp)
 {
     RootedObject wrapper(cx, wrapperArg);
     JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    vp->setUndefined(); // default result if we refuse to perform this action
-    const jsid id = JSID_VOID;
-    GET(DirectProxyHandler::iterate(cx, wrapper, flags, vp));
+    return DirectProxyHandler::iterate(cx, wrapper, flags, vp);
 }
 
 bool
 Wrapper::call(JSContext *cx, JSObject *wrapperArg, unsigned argc, Value *vp)
 {
     RootedObject wrapper(cx, wrapperArg);
-    vp->setUndefined(); // default result if we refuse to perform this action
-    const jsid id = JSID_VOID;
-    CHECKED(DirectProxyHandler::call(cx, wrapper, argc, vp), CALL);
+    return DirectProxyHandler::call(cx, wrapper, argc, vp);
 }
 
 bool
 Wrapper::construct(JSContext *cx, JSObject *wrapperArg, unsigned argc, Value *argv, Value *vp)
 {
     RootedObject wrapper(cx, wrapperArg);
-    vp->setUndefined(); // default result if we refuse to perform this action
-    const jsid id = JSID_VOID;
-    CHECKED(DirectProxyHandler::construct(cx, wrapper, argc, argv, vp), CALL);
+    return DirectProxyHandler::construct(cx, wrapper, argc, argv, vp);
 }
 
 bool
@@ -308,23 +279,13 @@ Wrapper::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallA
 bool
 Wrapper::hasInstance(JSContext *cx, HandleObject wrapper, MutableHandleValue v, bool *bp)
 {
-    *bp = false; // default result if we refuse to perform this action
-    const jsid id = JSID_VOID;
-    GET(DirectProxyHandler::hasInstance(cx, wrapper, v, bp));
+    return DirectProxyHandler::hasInstance(cx, wrapper, v, bp);
 }
 
 JSString *
 Wrapper::obj_toString(JSContext *cx, JSObject *wrapperArg)
 {
     RootedObject wrapper(cx, wrapperArg);
-    bool status;
-    if (!enter(cx, wrapper, JSID_VOID, GET, &status)) {
-        if (status) {
-            // Perform some default behavior that doesn't leak any information.
-            return JS_NewStringCopyZ(cx, "[object Object]");
-        }
-        return NULL;
-    }
     JSString *str = DirectProxyHandler::obj_toString(cx, wrapper);
     return str;
 }
@@ -332,17 +293,6 @@ Wrapper::obj_toString(JSContext *cx, JSObject *wrapperArg)
 JSString *
 Wrapper::fun_toString(JSContext *cx, JSObject *wrapper, unsigned indent)
 {
-    bool status;
-    if (!enter(cx, wrapper, JSID_VOID, GET, &status)) {
-        if (status) {
-            // Perform some default behavior that doesn't leak any information.
-            if (wrapper->isCallable())
-                return JS_NewStringCopyZ(cx, "function () {\n    [native code]\n}");
-            ReportIsNotFunction(cx, ObjectValue(*wrapper));
-            return NULL;
-        }
-        return NULL;
-    }
     JSString *str = DirectProxyHandler::fun_toString(cx, wrapper, indent);
     return str;
 }
diff --git a/js/xpconnect/tests/chrome/test_bug760109.xul b/js/xpconnect/tests/chrome/test_bug760109.xul
index 311ccb1e6ed..aa26158d510 100644
--- a/js/xpconnect/tests/chrome/test_bug760109.xul
+++ b/js/xpconnect/tests/chrome/test_bug760109.xul
@@ -31,12 +31,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=760109
     ok(protoProto === Object.prototype,
        "Object prototype remapped properly");
 
-    // Check |constructor|. The semantics of this weird for the case of an
-    // object with a custom chrome-implemented prototype, because we'll end up
-    // bouncing up the prototype chain to Object, even though that's not fully
-    // accurate. It's unlikely to be a problem though, so we just verify that
-    // it does what we expect.
-    ok(chromeObject.constructor === Object, "Object constructor does what we expect");
+    // Check |constructor|.
+    // Note that the 'constructor' property of the underlying chrome object
+    // will be resolved on SomeConstructor.prototype, which has an empty
+    // __exposedProps__. This means that we shouldn't remap the property, even
+    // though we'd also be able to find it on Object.prototype. Some recent
+    // refactoring has made it possible to do the right thing here.
+    is(typeof chromeObject.constructor, "undefined", "Object constructor does what we expect");
     ok(chromeArray.constructor === Array, "Array constructor remapped properly");
 
     // We should be able to .forEach on the Array.
diff --git a/js/xpconnect/tests/unit/test_bug780370.js b/js/xpconnect/tests/unit/test_bug780370.js
index 1e335d51a45..027f1341889 100644
--- a/js/xpconnect/tests/unit/test_bug780370.js
+++ b/js/xpconnect/tests/unit/test_bug780370.js
@@ -16,5 +16,8 @@ function run_test()
   do_check_eq(Cu.evalInSandbox('typeof obj.foo', sb), 'undefined', "COW works as expected");
   do_check_true(Cu.evalInSandbox('obj.hasOwnProperty === Object.prototype.hasOwnProperty', sb),
                 "Remapping happens even when the property is explicitly exposed");
-  do_check_eq(Cu.evalInSandbox('Object.prototype.bar = 10; obj.bar', sb), 10);
+  // NB: We used to test for the following, but such behavior became very
+  // difficult to implement in a recent refactor. We're moving away from this
+  // API anyway, so we decided to explicitly drop support for this.
+  // do_check_eq(Cu.evalInSandbox('Object.prototype.bar = 10; obj.bar', sb), 10);
 }
diff --git a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
index f2f6c79e6af..5868089d5d7 100644
--- a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
+++ b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
@@ -14,6 +14,16 @@ namespace xpc {
 // their prototype, we have to instrument the traps to do this manually.
 ChromeObjectWrapper ChromeObjectWrapper::singleton;
 
+static bool
+AllowedByBase(JSContext *cx, JSObject *wrapper, jsid id, js::Wrapper::Action act)
+{
+    MOZ_ASSERT(js::Wrapper::wrapperHandler(wrapper) ==
+               &ChromeObjectWrapper::singleton);
+    bool bp;
+    ChromeObjectWrapper *handler = &ChromeObjectWrapper::singleton;
+    return handler->ChromeObjectWrapperBase::enter(cx, wrapper, id, act, &bp);
+}
+
 static bool
 PropIsFromStandardPrototype(JSContext *cx, JSPropertyDescriptor *desc)
 {
@@ -23,16 +33,35 @@ PropIsFromStandardPrototype(JSContext *cx, JSPropertyDescriptor *desc)
     return JS_IdentifyClassPrototype(cx, unwrapped) != JSProto_Null;
 }
 
+// Note that we're past the policy enforcement stage, here, so we can query
+// ChromeObjectWrapperBase and get an unfiltered view of the underlying object.
+// This lets us determine whether the property we would have found (given a
+// transparent wrapper) would have come off a standard prototype.
+static bool
+PropIsFromStandardPrototype(JSContext *cx, JSObject *wrapper, jsid id)
+{
+    MOZ_ASSERT(js::Wrapper::wrapperHandler(wrapper) ==
+               &ChromeObjectWrapper::singleton);
+    JSPropertyDescriptor desc;
+    ChromeObjectWrapper *handler = &ChromeObjectWrapper::singleton;
+    if (!handler->ChromeObjectWrapperBase::getPropertyDescriptor(cx, wrapper, id,
+                                                                 &desc, 0) ||
+        !desc.obj)
+    {
+        return false;
+    }
+    return PropIsFromStandardPrototype(cx, &desc);
+}
+
 bool
 ChromeObjectWrapper::getPropertyDescriptor(JSContext *cx, JSObject *wrapper,
                                            jsid id, js::PropertyDescriptor *desc,
                                            unsigned flags)
 {
-    // First, try the lookup on the base wrapper. This can throw for various
-    // reasons, including sets (gets fail silently). There's nothing we can really
-    // do for sets, so we can conveniently propagate any exception we hit here.
+    // First, try a lookup on the base wrapper if permitted.
     desc->obj = NULL;
-    if (!ChromeObjectWrapperBase::getPropertyDescriptor(cx, wrapper, id,
+    if (AllowedByBase(cx, wrapper, id, Wrapper::GET) &&
+        !ChromeObjectWrapperBase::getPropertyDescriptor(cx, wrapper, id,
                                                         desc, flags)) {
         return false;
     }
@@ -58,9 +87,12 @@ ChromeObjectWrapper::getPropertyDescriptor(JSContext *cx, JSObject *wrapper,
 bool
 ChromeObjectWrapper::has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp)
 {
-    // Try the lookup on the base wrapper.
-    if (!ChromeObjectWrapperBase::has(cx, wrapper, id, bp))
+    // Try the lookup on the base wrapper if permitted.
+    if (AllowedByBase(cx, wrapper, id, js::Wrapper::GET) &&
+        !ChromeObjectWrapperBase::has(cx, wrapper, id, bp))
+    {
         return false;
+    }
 
     // If we found something or have no prototype, we're done.
     JSObject *wrapperProto;
@@ -82,19 +114,14 @@ bool
 ChromeObjectWrapper::get(JSContext *cx, JSObject *wrapper, JSObject *receiver,
                          jsid id, js::Value *vp)
 {
-    // Start with a call to getPropertyDescriptor. We unfortunately need to do
-    // this because the call signature of ::get doesn't give us any way to
-    // determine the object upon which the property was found.
-    JSPropertyDescriptor desc;
-    if (!ChromeObjectWrapperBase::getPropertyDescriptor(cx, wrapper, id, &desc,
-                                                        0)) {
-        return false;
-    }
-
-    // Only call through to the get trap on the underlying object if we'll find
-    // something, and if what we'll find is not on a standard prototype.
     vp->setUndefined();
-    if (desc.obj && !PropIsFromStandardPrototype(cx, &desc)) {
+    JSPropertyDescriptor desc;
+    // Only call through to the get trap on the underlying object if we're
+    // allowed to see the property, and if what we'll find is not on a standard
+    // prototype.
+    if (AllowedByBase(cx, wrapper, id, js::Wrapper::GET) &&
+        !PropIsFromStandardPrototype(cx, wrapper, id))
+    {
         // Call the get trap.
         if (!ChromeObjectWrapperBase::get(cx, wrapper, receiver, id, vp))
             return false;
@@ -115,4 +142,20 @@ ChromeObjectWrapper::get(JSContext *cx, JSObject *wrapper, JSObject *receiver,
     return js::GetGeneric(cx, wrapperProto, receiver, id, vp);
 }
 
+// This mechanism isn't ideal because we end up calling enter() on the base class
+// twice (once during enter() here and once during the trap itself), and policy
+// enforcement or COWs isn't cheap. But it results in the cleanest code, and this
+// whole proto remapping thing for COWs is going to be phased out anyway.
+bool
+ChromeObjectWrapper::enter(JSContext *cx, JSObject *wrapper, jsid id,
+                           js::Wrapper::Action act, bool *bp)
+{
+    if (AllowedByBase(cx, wrapper, id, act))
+        return true;
+    // COWs fail silently for GETs, and that also happens to be the only case
+    // where we might want to redirect the lookup to the home prototype chain.
+    *bp = (act == Wrapper::GET);
+    return *bp && PropIsFromStandardPrototype(cx, wrapper, id);
+}
+
 }
diff --git a/js/xpconnect/wrappers/ChromeObjectWrapper.h b/js/xpconnect/wrappers/ChromeObjectWrapper.h
index b5e0b7e9708..1a98f3a9026 100644
--- a/js/xpconnect/wrappers/ChromeObjectWrapper.h
+++ b/js/xpconnect/wrappers/ChromeObjectWrapper.h
@@ -37,6 +37,9 @@ class ChromeObjectWrapper : public ChromeObjectWrapperBase
     virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver,
                      jsid id, js::Value *vp) MOZ_OVERRIDE;
 
+    virtual bool enter(JSContext *cx, JSObject *wrapper, jsid id,
+                       js::Wrapper::Action act, bool *bp) MOZ_OVERRIDE;
+
     // NB: One might think we'd need to implement enumerate(), keys(), iterate(),
     // and getPropertyNames() here. However, ES5 built-in properties aren't
     // enumerable (and SpiderMonkey's implementation seems to match the spec
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index e7b442873db..84dcab856fc 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -983,12 +983,8 @@ XPCWrappedNativeXrayTraits::resolveOwnProperty(JSContext *cx, js::Wrapper &jsWra
            id == rt->GetStringID(XPCJSRuntime::IDX_NODEPRINCIPAL)) &&
           Is<nsINode>(wrapper)) ||
           (id == rt->GetStringID(XPCJSRuntime::IDX_DOCUMENTURIOBJECT) &&
-          Is<nsIDocument>(wrapper)))) {
-        bool status;
-        desc->obj = NULL; // default value
-        if (!jsWrapper.enter(cx, wrapper, id, Wrapper::GET, &status))
-            return status;
-
+          Is<nsIDocument>(wrapper))))
+    {
         desc->obj = wrapper;
         desc->attrs = JSPROP_ENUMERATE|JSPROP_SHARED;
         if (id == rt->GetStringID(XPCJSRuntime::IDX_BASEURIOBJECT))
@@ -1420,11 +1416,6 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, JSObject *wrappe
         return true;
     }
 
-    bool status;
-    desc->obj = NULL; // default value
-    if (!this->enter(cx, wrapper, id, Wrapper::GET, &status))
-        return status;
-
     typename Traits::ResolvingIdImpl resolving(wrapper, id);
 
     // Redirect access straight to the wrapper if we should be transparent.
@@ -1450,11 +1441,6 @@ XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, JSObject *wrappe
     XPCJSRuntime* rt = nsXPConnect::GetRuntimeInstance();
     if (AccessCheck::wrapperSubsumes(wrapper) &&
         id == rt->GetStringID(XPCJSRuntime::IDX_WRAPPED_JSOBJECT)) {
-        bool status;
-        desc->obj = NULL; // default value
-        if (!this->enter(cx, wrapper, id, Wrapper::GET, &status))
-            return status;
-
         desc->obj = wrapper;
         desc->attrs = JSPROP_ENUMERATE|JSPROP_SHARED;
         desc->getter = wrappedJSObject_getter;
@@ -1548,11 +1534,6 @@ XrayWrapper<Base, Traits>::getOwnPropertyDescriptor(JSContext *cx, JSObject *wra
         return true;
     }
 
-    bool status;
-    desc->obj = NULL; // default value
-    if (!this->enter(cx, wrapper, id, Wrapper::GET, &status))
-        return status;
-
     typename Traits::ResolvingIdImpl resolving(wrapper, id);
 
     // NB: Nothing we do here acts on the wrapped native itself, so we don't

From c014987e4f6b14c1dca86a302dbbc918cdf48773 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 25 Feb 2013 13:54:18 -0800
Subject: [PATCH 53/64] Bug 836301 - Hoist some assertions, remove a bunch of
 no-op trap overrides, and add assertions that we've entered our policy.
 r=mrbkap

---
 configure.in                                  |   3 +-
 js/src/configure.in                           |   3 +-
 js/src/jsapi.cpp                              |   3 +
 js/src/jscntxt.h                              |   6 +-
 js/src/jsfriendapi.h                          |   7 +
 js/src/jsproxy.cpp                            |  63 ++++++++
 js/src/jsproxy.h                              |  44 ++++++
 js/src/jswrapper.cpp                          | 137 ------------------
 js/src/jswrapper.h                            |  32 ----
 js/xpconnect/wrappers/ChromeObjectWrapper.cpp |  13 +-
 js/xpconnect/wrappers/FilteringWrapper.cpp    |   6 +
 js/xpconnect/wrappers/XrayWrapper.cpp         |   8 +
 12 files changed, 152 insertions(+), 173 deletions(-)

diff --git a/configure.in b/configure.in
index 35182a86c87..e01e33a274b 100644
--- a/configure.in
+++ b/configure.in
@@ -2157,8 +2157,9 @@ ia64*-hpux*)
         # that behavior) that it's better to turn it off.
         # MSVC warning C4819 warns some UTF-8 characters (e.g. copyright sign)
         # on non-Western system locales even if it is in a comment.
+        # khuey says we can safely ignore MSVC warning C4251
         CFLAGS="$CFLAGS -wd4819"
-        CXXFLAGS="$CXXFLAGS -wd4345 -wd4351 -wd4482 -wd4800 -wd4819"
+        CXXFLAGS="$CXXFLAGS -wd4251 -wd4345 -wd4351 -wd4482 -wd4800 -wd4819"
         # make 'foo == bar;' error out
         CFLAGS="$CFLAGS -we4553"
         CXXFLAGS="$CXXFLAGS -we4553"
diff --git a/js/src/configure.in b/js/src/configure.in
index 2cb27e94943..cfaae2a3d8c 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1684,7 +1684,8 @@ ia64*-hpux*)
         CFLAGS="$CFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
         CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
         # MSVC warning C4244 is ubiquitous, useless, and annoying.
-        CXXFLAGS="$CXXFLAGS -wd4244"
+        # khuey says we can safely ignore MSVC warning C4251
+        CXXFLAGS="$CXXFLAGS -wd4244 -wd4251"
         # make 'foo == bar;' error out
         CFLAGS="$CFLAGS -we4553"
         CXXFLAGS="$CXXFLAGS -we4553"
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index e6a244b63be..232ffd03e86 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -881,6 +881,9 @@ JSRuntime::JSRuntime(JSUseHelperThreads useHelperThreads)
     ionReturnOverride_(MagicValue(JS_ARG_POISON)),
     useHelperThreads_(useHelperThreads),
     requestedHelperThreadCount(-1),
+#ifdef DEBUG
+    enteredPolicy(NULL),
+#endif
     rngNonce(0)
 {
     /* Initialize infallibly first, so we can goto bad and JS_DestroyRuntime. */
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 31b9cb6d458..d3b7f33e26b 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -569,7 +569,7 @@ struct MallocProvider
 namespace gc {
 class MarkingValidator;
 } // namespace gc
-
+class AutoEnterPolicy;
 } // namespace js
 
 struct JSRuntime : js::RuntimeFriendFields,
@@ -1301,7 +1301,11 @@ struct JSRuntime : js::RuntimeFriendFields,
         return 0;
 #endif
     }
+#ifdef DEBUG
+  public:
+    js::AutoEnterPolicy *enteredPolicy;
 
+#endif
   private:
     /*
      * Used to ensure that compartments created at the same time get different
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index 0fb00e637e2..e8cf5a0eade 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1416,6 +1416,13 @@ class JS_FRIEND_API(AutoCTypesActivityCallback) {
     }
 };
 
+#ifdef DEBUG
+extern JS_FRIEND_API(void)
+assertEnteredPolicy(JSContext *cx, JSObject *obj, jsid id);
+#else
+inline JS_FRIEND_API(void) assertEnteredPolicy(JSContext *cx, JSObject *obj, jsid id) {};
+#endif
+
 } /* namespace js */
 
 #endif /* jsfriendapi_h___ */
diff --git a/js/src/jsproxy.cpp b/js/src/jsproxy.cpp
index 6998383c7a4..d344998c2aa 100644
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -63,6 +63,38 @@ js::AutoEnterPolicy::reportError(JSContext *cx, jsid id)
     }
 }
 
+#ifdef DEBUG
+void
+js::AutoEnterPolicy::recordEnter(JSContext *cx, JSObject *proxy, jsid id)
+{
+    if (allowed()) {
+        context = cx;
+        enteredProxy.construct(cx, proxy);
+        enteredId.construct(cx, id);
+        prev = cx->runtime->enteredPolicy;
+        cx->runtime->enteredPolicy = this;
+    }
+}
+
+void
+js::AutoEnterPolicy::recordLeave()
+{
+    if (!enteredProxy.empty()) {
+        JS_ASSERT(context->runtime->enteredPolicy == this);
+        context->runtime->enteredPolicy = prev;
+    }
+}
+
+JS_FRIEND_API(void)
+js::assertEnteredPolicy(JSContext *cx, JSObject *proxy, jsid id)
+{
+    MOZ_ASSERT(proxy->isProxy());
+    MOZ_ASSERT(cx->runtime->enteredPolicy);
+    MOZ_ASSERT(cx->runtime->enteredPolicy->enteredProxy.ref().get() == proxy);
+    MOZ_ASSERT(cx->runtime->enteredPolicy->enteredId.ref().get() == id);
+}
+#endif
+
 BaseProxyHandler::BaseProxyHandler(void *family)
   : mFamily(family),
     mHasPrototype(false),
@@ -85,6 +117,7 @@ BaseProxyHandler::enter(JSContext *cx, JSObject *wrapper, jsid id, Action act,
 bool
 BaseProxyHandler::has(JSContext *cx, JSObject *proxy_, jsid id_, bool *bp)
 {
+    assertEnteredPolicy(cx, proxy_, id_);
     RootedObject proxy(cx, proxy_);
     RootedId id(cx, id_);
     AutoPropertyDescriptorRooter desc(cx);
@@ -97,6 +130,7 @@ BaseProxyHandler::has(JSContext *cx, JSObject *proxy_, jsid id_, bool *bp)
 bool
 BaseProxyHandler::hasOwn(JSContext *cx, JSObject *proxy_, jsid id_, bool *bp)
 {
+    assertEnteredPolicy(cx, proxy_, id_);
     RootedObject proxy(cx, proxy_);
     RootedId id(cx, id_);
     AutoPropertyDescriptorRooter desc(cx);
@@ -109,6 +143,7 @@ BaseProxyHandler::hasOwn(JSContext *cx, JSObject *proxy_, jsid id_, bool *bp)
 bool
 BaseProxyHandler::get(JSContext *cx, JSObject *proxy, JSObject *receiver_, jsid id_, Value *vp)
 {
+    assertEnteredPolicy(cx, proxy, id_);
     RootedObject receiver(cx, receiver_);
     RootedId id(cx, id_);
 
@@ -150,6 +185,7 @@ BaseProxyHandler::getElementIfPresent(JSContext *cx, JSObject *proxy_, JSObject
     RootedId id(cx);
     if (!IndexToId(cx, index, &id))
         return false;
+    assertEnteredPolicy(cx, proxy, id);
 
     if (!has(cx, proxy, id, present))
         return false;
@@ -166,6 +202,7 @@ bool
 BaseProxyHandler::set(JSContext *cx, JSObject *proxy_, JSObject *receiver_, jsid id_, bool strict,
                       Value *vp)
 {
+    assertEnteredPolicy(cx, proxy_, id_);
     RootedObject proxy(cx, proxy_), receiver(cx, receiver_);
     RootedId id(cx, id_);
 
@@ -242,6 +279,7 @@ BaseProxyHandler::set(JSContext *cx, JSObject *proxy_, JSObject *receiver_, jsid
 bool
 BaseProxyHandler::keys(JSContext *cx, JSObject *proxyArg, AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, proxyArg, JSID_VOID);
     JS_ASSERT(props.length() == 0);
 
     RootedObject proxy(cx, proxyArg);
@@ -255,6 +293,7 @@ BaseProxyHandler::keys(JSContext *cx, JSObject *proxyArg, AutoIdVector &props)
     for (size_t j = 0, len = props.length(); j < len; j++) {
         JS_ASSERT(i <= j);
         jsid id = props[j];
+        AutoWaivePolicy policy(cx, proxy, id);
         if (!getOwnPropertyDescriptor(cx, proxy, id, &desc, 0))
             return false;
         if (desc.obj && (desc.attrs & JSPROP_ENUMERATE))
@@ -270,6 +309,7 @@ BaseProxyHandler::keys(JSContext *cx, JSObject *proxyArg, AutoIdVector &props)
 bool
 BaseProxyHandler::iterate(JSContext *cx, JSObject *proxy_, unsigned flags, Value *vp)
 {
+    assertEnteredPolicy(cx, proxy_, JSID_VOID);
     RootedObject proxy(cx, proxy_);
 
     AutoIdVector props(cx);
@@ -291,6 +331,7 @@ bool
 BaseProxyHandler::call(JSContext *cx, JSObject *proxy, unsigned argc,
                        Value *vp)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     AutoValueRooter rval(cx);
     RootedValue call(cx, GetCall(proxy));
     JSBool ok = Invoke(cx, vp[1], call, argc, JS_ARGV(cx, vp), rval.addr());
@@ -303,6 +344,7 @@ bool
 BaseProxyHandler::construct(JSContext *cx, JSObject *proxy_, unsigned argc,
                             Value *argv, Value *rval)
 {
+    assertEnteredPolicy(cx, proxy_, JSID_VOID);
     RootedObject proxy(cx, proxy_);
     RootedValue fval(cx, GetConstruct(proxy_));
     if (fval.isUndefined())
@@ -321,6 +363,7 @@ BaseProxyHandler::obj_toString(JSContext *cx, JSObject *proxy)
 JSString *
 BaseProxyHandler::fun_toString(JSContext *cx, JSObject *proxy, unsigned indent)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     Value fval = GetCall(proxy);
     if (IsFunctionProxy(proxy) &&
         (fval.isPrimitive() || !fval.toObject().isFunction())) {
@@ -366,6 +409,7 @@ BaseProxyHandler::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl im
 bool
 BaseProxyHandler::hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v, bool *bp)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     RootedValue val(cx, ObjectValue(*proxy.get()));
     js_ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS,
                         JSDVG_SEARCH_STACK, val, NullPtr());
@@ -402,6 +446,8 @@ bool
 DirectProxyHandler::getPropertyDescriptor(JSContext *cx, JSObject *proxy,
                                           jsid id, PropertyDescriptor *desc, unsigned flags)
 {
+    assertEnteredPolicy(cx, proxy, id);
+    JS_ASSERT(!hasPrototype()); // Should never be called if there's a prototype.
     RootedObject target(cx, GetProxyTargetObject(proxy));
     return JS_GetPropertyDescriptorById(cx, target, id, 0, desc);
 }
@@ -426,6 +472,7 @@ bool
 DirectProxyHandler::getOwnPropertyDescriptor(JSContext *cx, JSObject *proxy,
                                              jsid id, PropertyDescriptor *desc, unsigned flags)
 {
+    assertEnteredPolicy(cx, proxy, id);
     RootedObject target(cx, GetProxyTargetObject(proxy));
     return GetOwnPropertyDescriptor(cx, target, id, 0, desc);
 }
@@ -434,6 +481,7 @@ bool
 DirectProxyHandler::defineProperty(JSContext *cx, JSObject *proxy, jsid id_,
                                    PropertyDescriptor *desc)
 {
+    assertEnteredPolicy(cx, proxy, id_);
     RootedObject obj(cx, GetProxyTargetObject(proxy));
     Rooted<jsid> id(cx, id_);
     Rooted<Value> v(cx, desc->value);
@@ -445,6 +493,7 @@ bool
 DirectProxyHandler::getOwnPropertyNames(JSContext *cx, JSObject *proxy,
                                         AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     RootedObject target(cx, GetProxyTargetObject(proxy));
     return GetPropertyNames(cx, target, JSITER_OWNONLY | JSITER_HIDDEN, &props);
 }
@@ -453,6 +502,7 @@ bool
 DirectProxyHandler::delete_(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
 {
     RootedValue v(cx);
+    assertEnteredPolicy(cx, proxy, id);
     RootedObject target(cx, GetProxyTargetObject(proxy));
     if (!JS_DeletePropertyById2(cx, target, id, v.address()))
         return false;
@@ -467,6 +517,8 @@ bool
 DirectProxyHandler::enumerate(JSContext *cx, JSObject *proxy,
                               AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
+    JS_ASSERT(!hasPrototype()); // Should never be called if there's a prototype.
     RootedObject target(cx, GetProxyTargetObject(proxy));
     return GetPropertyNames(cx, target, 0, &props);
 }
@@ -488,6 +540,7 @@ bool
 DirectProxyHandler::hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v,
                                 bool *bp)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     JSBool b;
     RootedObject target(cx, GetProxyTargetObject(proxy));
     if (!JS_HasInstance(cx, target, v, &b))
@@ -508,6 +561,7 @@ DirectProxyHandler::objectClassIs(JSObject *proxy, ESClassValue classValue,
 JSString *
 DirectProxyHandler::obj_toString(JSContext *cx, JSObject *proxy)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     return obj_toStringHelper(cx, GetProxyTargetObject(proxy));
 }
 
@@ -515,6 +569,7 @@ JSString *
 DirectProxyHandler::fun_toString(JSContext *cx, JSObject *proxy,
                                  unsigned indent)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     RootedObject target(cx, GetProxyTargetObject(proxy));
     return fun_toStringHelper(cx, target, indent);
 }
@@ -550,6 +605,8 @@ DirectProxyHandler::DirectProxyHandler(void *family)
 bool
 DirectProxyHandler::has(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
 {
+    assertEnteredPolicy(cx, proxy, id);
+    JS_ASSERT(!hasPrototype()); // Should never be called if there's a prototype.
     JSBool found;
     RootedObject target(cx, GetProxyTargetObject(proxy));
     if (!JS_HasPropertyById(cx, target, id, &found))
@@ -561,6 +618,7 @@ DirectProxyHandler::has(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
 bool
 DirectProxyHandler::hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp)
 {
+    assertEnteredPolicy(cx, proxy, id);
     RootedObject target(cx, GetProxyTargetObject(proxy));
     AutoPropertyDescriptorRooter desc(cx);
     if (!JS_GetPropertyDescriptorById(cx, target, id, 0, &desc))
@@ -573,6 +631,7 @@ bool
 DirectProxyHandler::get(JSContext *cx, JSObject *proxy, JSObject *receiver_,
                         jsid id_, Value *vp)
 {
+    assertEnteredPolicy(cx, proxy, id_);
     RootedObject receiver(cx, receiver_);
     RootedId id(cx, id_);
     RootedValue value(cx);
@@ -588,6 +647,7 @@ bool
 DirectProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiverArg,
                         jsid id_, bool strict, Value *vp)
 {
+    assertEnteredPolicy(cx, proxy, id_);
     RootedId id(cx, id_);
     Rooted<JSObject*> receiver(cx, receiverArg);
     RootedValue value(cx, *vp);
@@ -602,6 +662,7 @@ DirectProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiverArg,
 bool
 DirectProxyHandler::keys(JSContext *cx, JSObject *proxy, AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
     return GetPropertyNames(cx, GetProxyTargetObject(proxy), JSITER_OWNONLY, &props);
 }
 
@@ -609,6 +670,8 @@ bool
 DirectProxyHandler::iterate(JSContext *cx, JSObject *proxy, unsigned flags,
                             Value *vp)
 {
+    assertEnteredPolicy(cx, proxy, JSID_VOID);
+    JS_ASSERT(!hasPrototype()); // Should never be called if there's a prototype.
     Rooted<JSObject*> target(cx, GetProxyTargetObject(proxy));
     RootedValue value(cx);
     if (!GetIterator(cx, target, flags, &value))
diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 315fb9b01eb..b2615df9833 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -349,22 +349,66 @@ class JS_FRIEND_API(AutoEnterPolicy)
     typedef BaseProxyHandler::Action Action;
     AutoEnterPolicy(JSContext *cx, BaseProxyHandler *handler,
                     JSObject *wrapper, jsid id, Action act, bool mayThrow)
+#ifdef DEBUG
+        : context(NULL)
+#endif
     {
         allow = handler->hasPolicy() ? handler->enter(cx, wrapper, id, act, &rv)
                                      : true;
+        recordEnter(cx, wrapper, id);
         if (!allow && !rv && mayThrow)
             reportError(cx, id);
     }
 
+    virtual ~AutoEnterPolicy() { recordLeave(); }
     inline bool allowed() { return allow; }
     inline bool returnValue() { JS_ASSERT(!allowed()); return rv; }
 
   protected:
+    // no-op constructor for subclass
+    AutoEnterPolicy()
+#ifdef DEBUG
+        : context(NULL)
+#endif
+        {};
     void reportError(JSContext *cx, jsid id);
     bool allow;
     bool rv;
+
+#ifdef DEBUG
+    JSContext *context;
+    mozilla::Maybe<RootedObject> enteredProxy;
+    mozilla::Maybe<RootedId> enteredId;
+    // NB: We explicitly don't track the entered action here, because sometimes
+    // SET traps do an implicit GET during their implementation, leading to
+    // spurious assertions.
+    AutoEnterPolicy *prev;
+    void recordEnter(JSContext *cx, JSObject *proxy, jsid id);
+    void recordLeave();
+
+    friend JS_FRIEND_API(void) assertEnteredPolicy(JSContext *cx, JSObject *proxy, jsid id);
+#else
+    inline void recordEnter(JSContext *cx, JSObject *proxy, jsid id) {}
+    inline void recordLeave() {}
+#endif
+
 };
 
+#ifdef DEBUG
+class JS_FRIEND_API(AutoWaivePolicy) : public AutoEnterPolicy {
+public:
+    AutoWaivePolicy(JSContext *cx, JSObject *proxy, jsid id)
+    {
+        allow = true;
+        recordEnter(cx, proxy, id);
+    }
+};
+#else
+class JS_FRIEND_API(AutoWaivePolicy) {
+    public: AutoWaivePolicy(JSContext *cx, JSObject *proxy, jsid id) {};
+};
+#endif
+
 } /* namespace js */
 
 extern JS_FRIEND_API(JSObject *)
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index 819b64a8b60..332b4c3ae1e 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -126,54 +126,6 @@ Wrapper::~Wrapper()
 {
 }
 
-bool
-Wrapper::getPropertyDescriptor(JSContext *cx, JSObject *wrapperArg,
-                               jsid id, PropertyDescriptor *desc, unsigned flags)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    return DirectProxyHandler::getPropertyDescriptor(cx, wrapper, id, desc, flags);
-}
-
-bool
-Wrapper::getOwnPropertyDescriptor(JSContext *cx, JSObject *wrapperArg,
-                                  jsid id, PropertyDescriptor *desc, unsigned flags)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::getOwnPropertyDescriptor(cx, wrapper, id, desc, flags);
-}
-
-bool
-Wrapper::defineProperty(JSContext *cx, JSObject *wrapperArg, jsid id,
-                        PropertyDescriptor *desc)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::defineProperty(cx, wrapper, id, desc);
-}
-
-bool
-Wrapper::getOwnPropertyNames(JSContext *cx, JSObject *wrapperArg,
-                             AutoIdVector &props)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::getOwnPropertyNames(cx, wrapper, props);
-}
-
-bool
-Wrapper::delete_(JSContext *cx, JSObject *wrapperArg, jsid id, bool *bp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::delete_(cx, wrapper, id, bp);
-}
-
-bool
-Wrapper::enumerate(JSContext *cx, JSObject *wrapperArg, AutoIdVector &props)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    return DirectProxyHandler::enumerate(cx, wrapper, props);
-}
-
 /*
  * Ordinarily, the convert trap would require unwrapping. However, the default
  * implementation of convert, JS_ConvertStub, obtains a default value by calling
@@ -208,95 +160,6 @@ Wrapper::defaultValue(JSContext *cx, JSObject *wrapperArg, JSType hint, Value *v
     return DirectProxyHandler::defaultValue(cx, wrapper, hint, vp);
 }
 
-bool
-Wrapper::has(JSContext *cx, JSObject *wrapperArg, jsid id, bool *bp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    return DirectProxyHandler::has(cx, wrapper, id, bp);
-}
-
-bool
-Wrapper::hasOwn(JSContext *cx, JSObject *wrapperArg, jsid id, bool *bp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::hasOwn(cx, wrapper, id, bp);
-}
-
-bool
-Wrapper::get(JSContext *cx, JSObject *wrapperArg, JSObject *receiver, jsid id, Value *vp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::get(cx, wrapper, receiver, id, vp);
-}
-
-bool
-Wrapper::set(JSContext *cx, JSObject *wrapperArg, JSObject *receiver, jsid id, bool strict,
-             Value *vp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::set(cx, wrapper, receiver, id, strict, vp);
-}
-
-bool
-Wrapper::keys(JSContext *cx, JSObject *wrapperArg, AutoIdVector &props)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::keys(cx, wrapper, props);
-}
-
-bool
-Wrapper::iterate(JSContext *cx, JSObject *wrapperArg, unsigned flags, Value *vp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    JS_ASSERT(!hasPrototype()); // Should never be called when there's a prototype.
-    return DirectProxyHandler::iterate(cx, wrapper, flags, vp);
-}
-
-bool
-Wrapper::call(JSContext *cx, JSObject *wrapperArg, unsigned argc, Value *vp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::call(cx, wrapper, argc, vp);
-}
-
-bool
-Wrapper::construct(JSContext *cx, JSObject *wrapperArg, unsigned argc, Value *argv, Value *vp)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    return DirectProxyHandler::construct(cx, wrapper, argc, argv, vp);
-}
-
-bool
-Wrapper::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args)
-{
-    RootedObject wrapper(cx, &args.thisv().toObject());
-    // Note - we don't enter a policy here because our security architecture guards
-    // against nativeCall by overriding the trap itself in the right circumstances.
-    return DirectProxyHandler::nativeCall(cx, test, impl, args);
-}
-
-bool
-Wrapper::hasInstance(JSContext *cx, HandleObject wrapper, MutableHandleValue v, bool *bp)
-{
-    return DirectProxyHandler::hasInstance(cx, wrapper, v, bp);
-}
-
-JSString *
-Wrapper::obj_toString(JSContext *cx, JSObject *wrapperArg)
-{
-    RootedObject wrapper(cx, wrapperArg);
-    JSString *str = DirectProxyHandler::obj_toString(cx, wrapper);
-    return str;
-}
-
-JSString *
-Wrapper::fun_toString(JSContext *cx, JSObject *wrapper, unsigned indent)
-{
-    JSString *str = DirectProxyHandler::fun_toString(cx, wrapper, indent);
-    return str;
-}
-
 Wrapper Wrapper::singleton((unsigned)0);
 Wrapper Wrapper::singletonWithPrototype((unsigned)0, true);
 
diff --git a/js/src/jswrapper.h b/js/src/jswrapper.h
index db03e9f55f4..c3967026ef6 100644
--- a/js/src/jswrapper.h
+++ b/js/src/jswrapper.h
@@ -66,38 +66,6 @@ class JS_FRIEND_API(Wrapper) : public DirectProxyHandler
     virtual ~Wrapper();
 
     /* ES5 Harmony fundamental wrapper traps. */
-    virtual bool getPropertyDescriptor(JSContext *cx, JSObject *wrapper,
-                                       jsid id, PropertyDescriptor *desc,
-                                       unsigned flags) MOZ_OVERRIDE;
-    virtual bool getOwnPropertyDescriptor(JSContext *cx, JSObject *wrapper,
-                                          jsid id, PropertyDescriptor *desc,
-                                          unsigned flags) MOZ_OVERRIDE;
-    virtual bool defineProperty(JSContext *cx, JSObject *wrapper, jsid id,
-                                PropertyDescriptor *desc) MOZ_OVERRIDE;
-    virtual bool getOwnPropertyNames(JSContext *cx, JSObject *wrapper,
-                                     AutoIdVector &props) MOZ_OVERRIDE;
-    virtual bool delete_(JSContext *cx, JSObject *wrapper, jsid id,
-                         bool *bp) MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, JSObject *wrapper,
-                           AutoIdVector &props) MOZ_OVERRIDE;
-
-    /* ES5 Harmony derived wrapper traps. */
-    virtual bool has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp) MOZ_OVERRIDE;
-    virtual bool hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp) MOZ_OVERRIDE;
-    virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, Value *vp) MOZ_OVERRIDE;
-    virtual bool set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict,
-                     Value *vp) MOZ_OVERRIDE;
-    virtual bool keys(JSContext *cx, JSObject *wrapper, AutoIdVector &props) MOZ_OVERRIDE;
-    virtual bool iterate(JSContext *cx, JSObject *wrapper, unsigned flags, Value *vp) MOZ_OVERRIDE;
-
-    /* Spidermonkey extensions. */
-    virtual bool call(JSContext *cx, JSObject *wrapper, unsigned argc, Value *vp) MOZ_OVERRIDE;
-    virtual bool construct(JSContext *cx, JSObject *wrapper, unsigned argc, Value *argv, Value *rval) MOZ_OVERRIDE;
-    virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
-                            CallArgs args) MOZ_OVERRIDE;
-    virtual bool hasInstance(JSContext *cx, HandleObject wrapper, MutableHandleValue v, bool *bp) MOZ_OVERRIDE;
-    virtual JSString *obj_toString(JSContext *cx, JSObject *wrapper) MOZ_OVERRIDE;
-    virtual JSString *fun_toString(JSContext *cx, JSObject *wrapper, unsigned indent) MOZ_OVERRIDE;
     virtual bool defaultValue(JSContext *cx, JSObject *wrapper_, JSType hint,
                               Value *vp) MOZ_OVERRIDE;
 
diff --git a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
index 5868089d5d7..68a84d0dc70 100644
--- a/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
+++ b/js/xpconnect/wrappers/ChromeObjectWrapper.cpp
@@ -14,6 +14,8 @@ namespace xpc {
 // their prototype, we have to instrument the traps to do this manually.
 ChromeObjectWrapper ChromeObjectWrapper::singleton;
 
+using js::assertEnteredPolicy;
+
 static bool
 AllowedByBase(JSContext *cx, JSObject *wrapper, jsid id, js::Wrapper::Action act)
 {
@@ -58,6 +60,7 @@ ChromeObjectWrapper::getPropertyDescriptor(JSContext *cx, JSObject *wrapper,
                                            jsid id, js::PropertyDescriptor *desc,
                                            unsigned flags)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     // First, try a lookup on the base wrapper if permitted.
     desc->obj = NULL;
     if (AllowedByBase(cx, wrapper, id, Wrapper::GET) &&
@@ -87,6 +90,7 @@ ChromeObjectWrapper::getPropertyDescriptor(JSContext *cx, JSObject *wrapper,
 bool
 ChromeObjectWrapper::has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     // Try the lookup on the base wrapper if permitted.
     if (AllowedByBase(cx, wrapper, id, js::Wrapper::GET) &&
         !ChromeObjectWrapperBase::has(cx, wrapper, id, bp))
@@ -114,6 +118,7 @@ bool
 ChromeObjectWrapper::get(JSContext *cx, JSObject *wrapper, JSObject *receiver,
                          jsid id, js::Value *vp)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     vp->setUndefined();
     JSPropertyDescriptor desc;
     // Only call through to the get trap on the underlying object if we're
@@ -155,7 +160,13 @@ ChromeObjectWrapper::enter(JSContext *cx, JSObject *wrapper, jsid id,
     // COWs fail silently for GETs, and that also happens to be the only case
     // where we might want to redirect the lookup to the home prototype chain.
     *bp = (act == Wrapper::GET);
-    return *bp && PropIsFromStandardPrototype(cx, wrapper, id);
+    if (!*bp || id == JSID_VOID)
+        return false;
+
+    // Note that PropIsFromStandardPrototype needs to invoke getPropertyDescriptor
+    // before we've fully entered the policy. Waive our policy.
+    js::AutoWaivePolicy policy(cx, wrapper, id);
+    return PropIsFromStandardPrototype(cx, wrapper, id);
 }
 
 }
diff --git a/js/xpconnect/wrappers/FilteringWrapper.cpp b/js/xpconnect/wrappers/FilteringWrapper.cpp
index 69c5a976b48..d8d06841f92 100644
--- a/js/xpconnect/wrappers/FilteringWrapper.cpp
+++ b/js/xpconnect/wrappers/FilteringWrapper.cpp
@@ -63,6 +63,7 @@ bool
 FilteringWrapper<Base, Policy>::getPropertyDescriptor(JSContext *cx, JSObject *wrapper, jsid id,
                                                       js::PropertyDescriptor *desc, unsigned flags)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     if (!Base::getPropertyDescriptor(cx, wrapper, id, desc, flags))
         return false;
     return FilterSetter<Policy>(cx, wrapper, id, desc);
@@ -74,6 +75,7 @@ FilteringWrapper<Base, Policy>::getOwnPropertyDescriptor(JSContext *cx, JSObject
                                                          js::PropertyDescriptor *desc,
                                                          unsigned flags)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     if (!Base::getOwnPropertyDescriptor(cx, wrapper, id, desc, flags))
         return false;
     return FilterSetter<Policy>(cx, wrapper, id, desc);
@@ -83,6 +85,7 @@ template <typename Base, typename Policy>
 bool
 FilteringWrapper<Base, Policy>::getOwnPropertyNames(JSContext *cx, JSObject *wrapper, AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     return Base::getOwnPropertyNames(cx, wrapper, props) &&
            Filter<Policy>(cx, wrapper, props);
 }
@@ -91,6 +94,7 @@ template <typename Base, typename Policy>
 bool
 FilteringWrapper<Base, Policy>::enumerate(JSContext *cx, JSObject *wrapper, AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     return Base::enumerate(cx, wrapper, props) &&
            Filter<Policy>(cx, wrapper, props);
 }
@@ -99,6 +103,7 @@ template <typename Base, typename Policy>
 bool
 FilteringWrapper<Base, Policy>::keys(JSContext *cx, JSObject *wrapper, AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     return Base::keys(cx, wrapper, props) &&
            Filter<Policy>(cx, wrapper, props);
 }
@@ -107,6 +112,7 @@ template <typename Base, typename Policy>
 bool
 FilteringWrapper<Base, Policy>::iterate(JSContext *cx, JSObject *wrapper, unsigned flags, Value *vp)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     // We refuse to trigger the iterator hook across chrome wrappers because
     // we don't know how to censor custom iterator objects. Instead we trigger
     // the default proxy iterate trap, which will ask enumerate() for the list
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index 84dcab856fc..f20e04b1b6f 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -1410,6 +1410,7 @@ bool
 XrayWrapper<Base, Traits>::getPropertyDescriptor(JSContext *cx, JSObject *wrapper, jsid id,
                                                  js::PropertyDescriptor *desc, unsigned flags)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     JSObject *holder = Traits::singleton.ensureHolder(cx, wrapper);
     if (Traits::isResolving(cx, holder, id)) {
         desc->obj = NULL;
@@ -1528,6 +1529,7 @@ bool
 XrayWrapper<Base, Traits>::getOwnPropertyDescriptor(JSContext *cx, JSObject *wrapper, jsid id,
                                                     PropertyDescriptor *desc, unsigned flags)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     JSObject *holder = Traits::singleton.ensureHolder(cx, wrapper);
     if (Traits::isResolving(cx, holder, id)) {
         desc->obj = NULL;
@@ -1574,6 +1576,7 @@ bool
 XrayWrapper<Base, Traits>::defineProperty(JSContext *cx, JSObject *wrapper, jsid id,
                                           js::PropertyDescriptor *desc)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     // Redirect access straight to the wrapper if we should be transparent.
     if (XrayUtils::IsTransparent(cx, wrapper, id)) {
         JSObject *obj = Traits::getTargetObject(wrapper);
@@ -1626,6 +1629,7 @@ bool
 XrayWrapper<Base, Traits>::getOwnPropertyNames(JSContext *cx, JSObject *wrapper,
                                                JS::AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     return enumerate(cx, wrapper, JSITER_OWNONLY | JSITER_HIDDEN, props);
 }
 
@@ -1633,6 +1637,7 @@ template <typename Base, typename Traits>
 bool
 XrayWrapper<Base, Traits>::delete_(JSContext *cx, JSObject *wrapper, jsid id, bool *bp)
 {
+    assertEnteredPolicy(cx, wrapper, id);
     // Redirect access straight to the wrapper if we should be transparent.
     if (XrayUtils::IsTransparent(cx, wrapper, id)) {
         JSObject *obj = Traits::getTargetObject(wrapper);
@@ -1669,6 +1674,7 @@ bool
 XrayWrapper<Base, Traits>::enumerate(JSContext *cx, JSObject *wrapper, unsigned flags,
                                      JS::AutoIdVector &props)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     // Redirect access straight to the wrapper if we should be transparent.
     if (XrayUtils::IsTransparent(cx, wrapper, JSID_VOID)) {
         JSObject *obj = Traits::getTargetObject(wrapper);
@@ -1762,6 +1768,7 @@ template <typename Base, typename Traits>
 bool
 XrayWrapper<Base, Traits>::call(JSContext *cx, JSObject *wrapper, unsigned argc, js::Value *vp)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     return Traits::call(cx, wrapper, argc, vp);
 }
 
@@ -1770,6 +1777,7 @@ bool
 XrayWrapper<Base, Traits>::construct(JSContext *cx, JSObject *wrapper, unsigned argc,
                                      js::Value *argv, js::Value *rval)
 {
+    assertEnteredPolicy(cx, wrapper, JSID_VOID);
     return Traits::construct(cx, wrapper, argc, argv, rval);
 }
 

From d71109ac5ff7ccafc2b06002c0dc23d73e75e8f1 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Mon, 25 Feb 2013 16:56:45 -0500
Subject: [PATCH 54/64] Bug 845008 - Metro's save file picker always throws on
 appendFilter. r=tabraldes

---
 widget/windows/winrt/nsMetroFilePicker.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/widget/windows/winrt/nsMetroFilePicker.cpp b/widget/windows/winrt/nsMetroFilePicker.cpp
index beb4b3aafd3..be37823bcc2 100644
--- a/widget/windows/winrt/nsMetroFilePicker.cpp
+++ b/widget/windows/winrt/nsMetroFilePicker.cpp
@@ -474,6 +474,7 @@ nsMetroFilePicker::AppendFilter(const nsAString& aTitle,
     boolean replaced;
     map->Insert(key.Get(), saveTypes.Get(), &replaced);
   }
+  break;
 
   default:
     return NS_ERROR_FAILURE;

From 0c513c127dbad5c8d746fd90d11bc34bd563aa57 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Mon, 25 Feb 2013 17:11:02 -0500
Subject: [PATCH 55/64] Bug 843888 - Reduce LayerView overdraw by removing the
 background. r=sriram

---
 mobile/android/base/resources/layout/shared_ui_components.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/android/base/resources/layout/shared_ui_components.xml b/mobile/android/base/resources/layout/shared_ui_components.xml
index 51b7119c6a3..964cf4283e4 100644
--- a/mobile/android/base/resources/layout/shared_ui_components.xml
+++ b/mobile/android/base/resources/layout/shared_ui_components.xml
@@ -10,8 +10,7 @@
 
     <org.mozilla.gecko.gfx.LayerView android:id="@+id/layer_view"
                                      android:layout_width="fill_parent"
-                                     android:layout_height="fill_parent"
-                                     android:background="#FFF"/>
+                                     android:layout_height="fill_parent"/>
 
     <AbsoluteLayout android:id="@+id/plugin_container"
                     android:background="@android:color/transparent"

From 59348db6ca7960f701e2ade1e8cde7325a586e1f Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 25 Feb 2013 15:17:12 -0700
Subject: [PATCH 56/64] Bug 844364 - Fix bogus assertion, inverted test when
 compiling JSOP_EVAL, r=jandem.

---
 js/src/ion/IonBuilder.cpp              | 17 ++++++++---------
 js/src/jit-test/tests/ion/bug844364.js |  6 ++++++
 js/src/jit-test/tests/ion/bug844459.js |  7 +++++++
 js/src/jsinterpinlines.h               |  6 ++++--
 4 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 js/src/jit-test/tests/ion/bug844364.js
 create mode 100644 js/src/jit-test/tests/ion/bug844459.js

diff --git a/js/src/ion/IonBuilder.cpp b/js/src/ion/IonBuilder.cpp
index 0a9062b7e8e..a90fc9cf70e 100644
--- a/js/src/ion/IonBuilder.cpp
+++ b/js/src/ion/IonBuilder.cpp
@@ -4488,15 +4488,14 @@ IonBuilder::jsop_eval(uint32_t argc)
             return abort("Direct eval in global code");
 
         types::StackTypeSet *thisTypes = oracle->thisTypeSet(script());
-        if (!thisTypes) {
-            // The 'this' value for the outer and eval scripts must be the
-            // same. This is not guaranteed if a primitive string/number/etc.
-            // is passed through to the eval invoke as the primitive may be
-            // boxed into different objects if accessed via 'this'.
-            JSValueType type = thisTypes->getKnownTypeTag();
-            if (type != JSVAL_TYPE_OBJECT && type != JSVAL_TYPE_NULL && type != JSVAL_TYPE_UNDEFINED)
-                return abort("Direct eval from script with maybe-primitive 'this'");
-        }
+
+        // The 'this' value for the outer and eval scripts must be the
+        // same. This is not guaranteed if a primitive string/number/etc.
+        // is passed through to the eval invoke as the primitive may be
+        // boxed into different objects if accessed via 'this'.
+        JSValueType type = thisTypes->getKnownTypeTag();
+        if (type != JSVAL_TYPE_OBJECT && type != JSVAL_TYPE_NULL && type != JSVAL_TYPE_UNDEFINED)
+            return abort("Direct eval from script with maybe-primitive 'this'");
 
         CallInfo callInfo(cx, /* constructing = */ false);
         if (!callInfo.init(current, argc))
diff --git a/js/src/jit-test/tests/ion/bug844364.js b/js/src/jit-test/tests/ion/bug844364.js
new file mode 100644
index 00000000000..c94514c8036
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug844364.js
@@ -0,0 +1,6 @@
+
+function f() {
+  eval("this")
+}
+f()
+f()
diff --git a/js/src/jit-test/tests/ion/bug844459.js b/js/src/jit-test/tests/ion/bug844459.js
new file mode 100644
index 00000000000..b1901d77478
--- /dev/null
+++ b/js/src/jit-test/tests/ion/bug844459.js
@@ -0,0 +1,7 @@
+
+
+function testEvalThrow(x, y) {
+  eval("");
+}
+for (var i = 0; i < 5; i++)
+  testEvalThrow.call("");
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index c2900a4b29d..4d12a86fe32 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -97,9 +97,11 @@ ComputeThis(JSContext *cx, AbstractFramePtr frame)
          * |this| slot. If we lazily wrap a primitive |this| in an eval function frame, the
          * eval's frame will get the wrapper, but the function's frame will not. To prevent
          * this, we always wrap a function's |this| before pushing an eval frame, and should
-         * thus never see an unwrapped primitive in a non-strict eval function frame.
+         * thus never see an unwrapped primitive in a non-strict eval function frame. Null
+         * and undefined |this| values will unwrap to the same object in the function and
+         * eval frames, so are not required to be wrapped.
          */
-        JS_ASSERT(!frame.isEvalFrame());
+        JS_ASSERT_IF(frame.isEvalFrame(), thisv.isUndefined() || thisv.isNull());
     }
     bool modified;
     if (!BoxNonStrictThis(cx, &thisv, &modified))

From b9530756adf4148e4b14ed51f359ffd6703c61ba Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 25 Feb 2013 15:21:13 -0700
Subject: [PATCH 57/64] Bug 844482 - Watch for OOM disabling TI under
 CreateThisForFunction, r=dvander.

---
 js/src/ion/Ion.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/ion/Ion.cpp b/js/src/ion/Ion.cpp
index bd91164fcee..8e0034941f9 100644
--- a/js/src/ion/Ion.cpp
+++ b/js/src/ion/Ion.cpp
@@ -1495,7 +1495,7 @@ ion::CanEnter(JSContext *cx, JSScript *script, AbstractFramePtr fp, bool isConst
         RootedScript scriptRoot(cx, script);
         RootedObject callee(cx, &fp.callee());
         RootedObject obj(cx, CreateThisForFunction(cx, callee, fp.useNewType()));
-        if (!obj)
+        if (!obj || !ion::IsEnabled(cx)) // Note: OOM under CreateThis can disable TI.
             return Method_Skipped;
         fp.thisValue().setObject(*obj);
         script = scriptRoot;

From 3a2fdeb18a30150fc2a8f8a034ffd8c1c0c97261 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 25 Feb 2013 12:10:41 -0500
Subject: [PATCH 58/64] Bug 780474 - Disable the struct/class mismatch warning
 on MSVC as well; r=glandium

--HG--
extra : rebase_source : 3e593b71e589df349abc41f9182739305478690f
---
 build/autoconf/compiler-opts.m4        | 9 +++++++++
 js/src/build/autoconf/compiler-opts.m4 | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
index ec5fe6b688a..e09a4563c3c 100644
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -94,6 +94,15 @@ if test "$CLANG_CXX"; then
     _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-mismatched-tags"
 fi
 
+if test -z "$GNU_CC"; then
+    case "$target" in
+    *-mingw*)
+        ## Warning 4099 (equivalent of mismatched-tags) is disabled (bug 780474)
+        ## for the same reasons as above.
+        _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -wd4099"
+    esac
+fi
+
 if test "$GNU_CC"; then
     CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
     CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fno-exceptions"
diff --git a/js/src/build/autoconf/compiler-opts.m4 b/js/src/build/autoconf/compiler-opts.m4
index ec5fe6b688a..e09a4563c3c 100644
--- a/js/src/build/autoconf/compiler-opts.m4
+++ b/js/src/build/autoconf/compiler-opts.m4
@@ -94,6 +94,15 @@ if test "$CLANG_CXX"; then
     _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-mismatched-tags"
 fi
 
+if test -z "$GNU_CC"; then
+    case "$target" in
+    *-mingw*)
+        ## Warning 4099 (equivalent of mismatched-tags) is disabled (bug 780474)
+        ## for the same reasons as above.
+        _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -wd4099"
+    esac
+fi
+
 if test "$GNU_CC"; then
     CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
     CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fno-exceptions"

From 87b07b289898f1ba73d2ac9fb1c85355b3655873 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 22 Feb 2013 19:59:26 -0500
Subject: [PATCH 59/64] Bug 844169 - Part 1: Rename nsHTMLIFrameElement to
 mozilla::dom::HTMLIFrameElement; r=bzbarsky

--HG--
rename : content/html/content/src/nsHTMLIFrameElement.cpp => content/html/content/src/HTMLIFrameElement.cpp
rename : content/html/content/src/nsHTMLIFrameElement.h => content/html/content/src/HTMLIFrameElement.h
extra : rebase_source : 67c393954a0c46f80b8729277504e9ced5c64d33
---
 content/base/src/nsFrameLoader.cpp            |  6 +-
 ...FrameElement.cpp => HTMLIFrameElement.cpp} | 93 ++++++++++---------
 ...TMLIFrameElement.h => HTMLIFrameElement.h} | 25 +++--
 content/html/content/src/Makefile.in          |  4 +-
 dom/browser-element/BrowserElementParent.cpp  | 13 +--
 5 files changed, 78 insertions(+), 63 deletions(-)
 rename content/html/content/src/{nsHTMLIFrameElement.cpp => HTMLIFrameElement.cpp} (71%)
 rename content/html/content/src/{nsHTMLIFrameElement.h => HTMLIFrameElement.h} (73%)

diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp
index 06f8e5d279b..2b581c4049f 100644
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -86,7 +86,7 @@
 #include "sampler.h"
 
 #include "jsapi.h"
-#include "nsHTMLIFrameElement.h"
+#include "mozilla/dom/HTMLIFrameElement.h"
 #include "nsSandboxFlags.h"
 
 #include "mozilla/dom/StructuredCloneUtils.h"
@@ -450,8 +450,8 @@ nsFrameLoader::ReallyStartLoadingInternal()
 
   // Is this an <iframe> with a sandbox attribute or a parent which is
   // sandboxed ?
-  nsHTMLIFrameElement* iframe =
-    nsHTMLIFrameElement::FromContent(mOwnerContent);
+  HTMLIFrameElement* iframe =
+    HTMLIFrameElement::FromContent(mOwnerContent);
 
   uint32_t sandboxFlags = 0;
 
diff --git a/content/html/content/src/nsHTMLIFrameElement.cpp b/content/html/content/src/HTMLIFrameElement.cpp
similarity index 71%
rename from content/html/content/src/nsHTMLIFrameElement.cpp
rename to content/html/content/src/HTMLIFrameElement.cpp
index a15ef0eda49..81b0afa65fc 100644
--- a/content/html/content/src/nsHTMLIFrameElement.cpp
+++ b/content/html/content/src/HTMLIFrameElement.cpp
@@ -5,7 +5,7 @@
 
 #include "mozilla/Util.h"
 
-#include "nsHTMLIFrameElement.h"
+#include "mozilla/dom/HTMLIFrameElement.h"
 #include "nsIDOMSVGDocument.h"
 #include "nsMappedAttributes.h"
 #include "nsAttrValueInlines.h"
@@ -14,86 +14,86 @@
 #include "nsStyleConsts.h"
 #include "nsContentUtils.h"
 
-using namespace mozilla;
-using namespace mozilla::dom;
-
 NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(IFrame)
 
-nsHTMLIFrameElement::nsHTMLIFrameElement(already_AddRefed<nsINodeInfo> aNodeInfo,
-                                         FromParser aFromParser)
+DOMCI_NODE_DATA(HTMLIFrameElement, mozilla::dom::HTMLIFrameElement)
+
+namespace mozilla {
+namespace dom {
+
+HTMLIFrameElement::HTMLIFrameElement(already_AddRefed<nsINodeInfo> aNodeInfo,
+                                     FromParser aFromParser)
   : nsGenericHTMLFrameElement(aNodeInfo, aFromParser)
 {
 }
 
-nsHTMLIFrameElement::~nsHTMLIFrameElement()
+HTMLIFrameElement::~HTMLIFrameElement()
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLIFrameElement, Element)
-NS_IMPL_RELEASE_INHERITED(nsHTMLIFrameElement, Element)
+NS_IMPL_ADDREF_INHERITED(HTMLIFrameElement, Element)
+NS_IMPL_RELEASE_INHERITED(HTMLIFrameElement, Element)
 
-DOMCI_NODE_DATA(HTMLIFrameElement, nsHTMLIFrameElement)
-
-// QueryInterface implementation for nsHTMLIFrameElement
-NS_INTERFACE_TABLE_HEAD(nsHTMLIFrameElement)
-  NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(nsHTMLIFrameElement)
-    NS_INTERFACE_TABLE_ENTRY(nsHTMLIFrameElement, nsIDOMHTMLIFrameElement)
-    NS_INTERFACE_TABLE_ENTRY(nsHTMLIFrameElement, nsIDOMGetSVGDocument)
+// QueryInterface implementation for HTMLIFrameElement
+NS_INTERFACE_TABLE_HEAD(HTMLIFrameElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(HTMLIFrameElement)
+    NS_INTERFACE_TABLE_ENTRY(HTMLIFrameElement, nsIDOMHTMLIFrameElement)
+    NS_INTERFACE_TABLE_ENTRY(HTMLIFrameElement, nsIDOMGetSVGDocument)
   NS_OFFSET_AND_INTERFACE_TABLE_END
-  NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLIFrameElement,
+  NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(HTMLIFrameElement,
                                                nsGenericHTMLFrameElement)
 NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLIFrameElement)
 
-NS_IMPL_ELEMENT_CLONE(nsHTMLIFrameElement)
+NS_IMPL_ELEMENT_CLONE(HTMLIFrameElement)
 
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Align, align)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, FrameBorder, frameborder)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Height, height)
-NS_IMPL_URI_ATTR(nsHTMLIFrameElement, LongDesc, longdesc)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, MarginHeight, marginheight)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, MarginWidth, marginwidth)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Name, name)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Scrolling, scrolling)
-NS_IMPL_URI_ATTR(nsHTMLIFrameElement, Src, src)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Width, width)
-NS_IMPL_BOOL_ATTR(nsHTMLIFrameElement, Allowfullscreen, allowfullscreen)
-NS_IMPL_STRING_ATTR(nsHTMLIFrameElement, Sandbox, sandbox)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, Align, align)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, FrameBorder, frameborder)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, Height, height)
+NS_IMPL_URI_ATTR(HTMLIFrameElement, LongDesc, longdesc)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, MarginHeight, marginheight)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, MarginWidth, marginwidth)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, Name, name)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, Scrolling, scrolling)
+NS_IMPL_URI_ATTR(HTMLIFrameElement, Src, src)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, Width, width)
+NS_IMPL_BOOL_ATTR(HTMLIFrameElement, Allowfullscreen, allowfullscreen)
+NS_IMPL_STRING_ATTR(HTMLIFrameElement, Sandbox, sandbox)
 
 void
-nsHTMLIFrameElement::GetItemValueText(nsAString& aValue)
+HTMLIFrameElement::GetItemValueText(nsAString& aValue)
 {
   GetSrc(aValue);
 }
 
 void
-nsHTMLIFrameElement::SetItemValueText(const nsAString& aValue)
+HTMLIFrameElement::SetItemValueText(const nsAString& aValue)
 {
   SetSrc(aValue);
 }
 
 NS_IMETHODIMP
-nsHTMLIFrameElement::GetContentDocument(nsIDOMDocument** aContentDocument)
+HTMLIFrameElement::GetContentDocument(nsIDOMDocument** aContentDocument)
 {
   return nsGenericHTMLFrameElement::GetContentDocument(aContentDocument);
 }
 
 NS_IMETHODIMP
-nsHTMLIFrameElement::GetContentWindow(nsIDOMWindow** aContentWindow)
+HTMLIFrameElement::GetContentWindow(nsIDOMWindow** aContentWindow)
 {
   return nsGenericHTMLFrameElement::GetContentWindow(aContentWindow);
 }
 
 NS_IMETHODIMP
-nsHTMLIFrameElement::GetSVGDocument(nsIDOMDocument **aResult)
+HTMLIFrameElement::GetSVGDocument(nsIDOMDocument **aResult)
 {
   return GetContentDocument(aResult);
 }
 
 bool
-nsHTMLIFrameElement::ParseAttribute(int32_t aNamespaceID,
-                                    nsIAtom* aAttribute,
-                                    const nsAString& aValue,
-                                    nsAttrValue& aResult)
+HTMLIFrameElement::ParseAttribute(int32_t aNamespaceID,
+                                  nsIAtom* aAttribute,
+                                  const nsAString& aValue,
+                                  nsAttrValue& aResult)
 {
   if (aNamespaceID == kNameSpaceID_None) {
     if (aAttribute == nsGkAtoms::marginwidth) {
@@ -180,7 +180,7 @@ MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
 }
 
 NS_IMETHODIMP_(bool)
-nsHTMLIFrameElement::IsAttributeMapped(const nsIAtom* aAttribute) const
+HTMLIFrameElement::IsAttributeMapped(const nsIAtom* aAttribute) const
 {
   static const MappedAttributeEntry attributes[] = {
     { &nsGkAtoms::width },
@@ -202,15 +202,15 @@ nsHTMLIFrameElement::IsAttributeMapped(const nsIAtom* aAttribute) const
 
 
 nsMapRuleToAttributesFunc
-nsHTMLIFrameElement::GetAttributeMappingFunction() const
+HTMLIFrameElement::GetAttributeMappingFunction() const
 {
   return &MapAttributesIntoRule;
 }
 
 nsresult
-nsHTMLIFrameElement::AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
-                                  const nsAttrValue* aValue,
-                                  bool aNotify)
+HTMLIFrameElement::AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
+                                const nsAttrValue* aValue,
+                                bool aNotify)
 {
   if (aName == nsGkAtoms::sandbox && aNameSpaceID == kNameSpaceID_None) {
     // Parse the new value of the sandbox attribute, and if we have a docshell
@@ -237,7 +237,7 @@ nsHTMLIFrameElement::AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
 }
 
 uint32_t
-nsHTMLIFrameElement::GetSandboxFlags()
+HTMLIFrameElement::GetSandboxFlags()
 {
   nsAutoString sandboxAttr;
 
@@ -248,3 +248,6 @@ nsHTMLIFrameElement::GetSandboxFlags()
   // No sandbox attribute, no sandbox flags.
   return 0;
 }
+
+} // namespace dom
+} // namespace mozilla
diff --git a/content/html/content/src/nsHTMLIFrameElement.h b/content/html/content/src/HTMLIFrameElement.h
similarity index 73%
rename from content/html/content/src/nsHTMLIFrameElement.h
rename to content/html/content/src/HTMLIFrameElement.h
index 807b5c6f3df..0c805ccd3aa 100644
--- a/content/html/content/src/nsHTMLIFrameElement.h
+++ b/content/html/content/src/HTMLIFrameElement.h
@@ -3,20 +3,26 @@
  * 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_HTMLIFrameElement_h
+#define mozilla_dom_HTMLIFrameElement_h
+
 #include "nsGenericHTMLFrameElement.h"
 #include "nsIDOMHTMLIFrameElement.h"
 #include "nsIDOMGetSVGDocument.h"
 
-class nsHTMLIFrameElement : public nsGenericHTMLFrameElement
-                          , public nsIDOMHTMLIFrameElement
-                          , public nsIDOMGetSVGDocument
+namespace mozilla {
+namespace dom {
+
+class HTMLIFrameElement MOZ_FINAL : public nsGenericHTMLFrameElement
+                                  , public nsIDOMHTMLIFrameElement
+                                  , public nsIDOMGetSVGDocument
 {
 public:
-  nsHTMLIFrameElement(already_AddRefed<nsINodeInfo> aNodeInfo,
-                      mozilla::dom::FromParser aFromParser = mozilla::dom::NOT_FROM_PARSER);
-  virtual ~nsHTMLIFrameElement();
+  HTMLIFrameElement(already_AddRefed<nsINodeInfo> aNodeInfo,
+                    FromParser aFromParser = NOT_FROM_PARSER);
+  virtual ~HTMLIFrameElement();
 
-  NS_IMPL_FROMCONTENT_HTML_WITH_TAG(nsHTMLIFrameElement, iframe)
+  NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLIFrameElement, iframe)
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
@@ -58,3 +64,8 @@ protected:
   virtual void GetItemValueText(nsAString& text);
   virtual void SetItemValueText(const nsAString& text);
 };
+
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index 433fef732da..901cc521d3e 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -21,7 +21,6 @@ endif # !_MSC_VER
 EXPORTS		= \
 		HTMLPropertiesCollection.h \
 		nsGenericHTMLElement.h \
-		nsHTMLIFrameElement.h \
 		nsClientRect.h \
 		nsHTMLDNSPrefetch.h \
 		nsTimeRanges.h \
@@ -43,6 +42,7 @@ EXPORTS_mozilla/dom = \
 		HTMLFrameSetElement.h \
 		HTMLHeadingElement.h \
 		HTMLHRElement.h \
+		HTMLIFrameElement.h \
 		HTMLImageElement.h \
 		HTMLLabelElement.h \
 		HTMLLegendElement.h \
@@ -103,7 +103,7 @@ CPPSRCS		= \
 		HTMLFrameSetElement.cpp \
 		HTMLHRElement.cpp \
 		HTMLHeadingElement.cpp \
-		nsHTMLIFrameElement.cpp \
+		HTMLIFrameElement.cpp \
 		HTMLImageElement.cpp \
 		nsHTMLInputElement.cpp \
 		HTMLLIElement.cpp \
diff --git a/dom/browser-element/BrowserElementParent.cpp b/dom/browser-element/BrowserElementParent.cpp
index 6e99b45df88..f88ca69e4b2 100644
--- a/dom/browser-element/BrowserElementParent.cpp
+++ b/dom/browser-element/BrowserElementParent.cpp
@@ -13,7 +13,7 @@
 #endif
 
 #include "BrowserElementParent.h"
-#include "nsHTMLIFrameElement.h"
+#include "mozilla/dom/HTMLIFrameElement.h"
 #include "nsOpenWindowEventDetail.h"
 #include "nsEventDispatcher.h"
 #include "nsIDOMCustomEvent.h"
@@ -22,6 +22,7 @@
 #include "nsAsyncScrollEventDetail.h"
 
 using mozilla::dom::Element;
+using mozilla::dom::HTMLIFrameElement;
 using mozilla::dom::TabParent;
 
 namespace {
@@ -30,7 +31,7 @@ namespace {
  * Create an <iframe mozbrowser> owned by the same document as
  * aOpenerFrameElement.
  */
-already_AddRefed<nsHTMLIFrameElement>
+already_AddRefed<HTMLIFrameElement>
 CreateIframe(Element* aOpenerFrameElement, const nsAString& aName, bool aRemote)
 {
   nsNodeInfoManager *nodeInfoManager =
@@ -42,8 +43,8 @@ CreateIframe(Element* aOpenerFrameElement, const nsAString& aName, bool aRemote)
                                  kNameSpaceID_XHTML,
                                  nsIDOMNode::ELEMENT_NODE);
 
-  nsRefPtr<nsHTMLIFrameElement> popupFrameElement =
-    static_cast<nsHTMLIFrameElement*>(
+  nsRefPtr<HTMLIFrameElement> popupFrameElement =
+    static_cast<HTMLIFrameElement*>(
       NS_NewHTMLIFrameElement(nodeInfo.forget(), mozilla::dom::NOT_FROM_PARSER));
 
   popupFrameElement->SetMozbrowser(true);
@@ -151,7 +152,7 @@ BrowserElementParent::OpenWindowOOP(TabParent* aOpenerTabParent,
   nsCOMPtr<Element> openerFrameElement =
     do_QueryInterface(aOpenerTabParent->GetOwnerElement());
   NS_ENSURE_TRUE(openerFrameElement, false);
-  nsRefPtr<nsHTMLIFrameElement> popupFrameElement =
+  nsRefPtr<HTMLIFrameElement> popupFrameElement =
     CreateIframe(openerFrameElement, aName, /* aRemote = */ true);
 
   // Normally an <iframe> element will try to create a frameLoader when the
@@ -209,7 +210,7 @@ BrowserElementParent::OpenWindowInProcess(nsIDOMWindow* aOpenerWindow,
   nsCOMPtr<Element> openerFrameElement =
     do_QueryInterface(openerFrameDOMElement);
 
-  nsRefPtr<nsHTMLIFrameElement> popupFrameElement =
+  nsRefPtr<HTMLIFrameElement> popupFrameElement =
     CreateIframe(openerFrameElement, aName, /* aRemote = */ false);
   NS_ENSURE_TRUE(popupFrameElement, false);
 

From 97d638251f79b5ae85bc8a1824cb25181ecc4043 Mon Sep 17 00:00:00 2001
From: Brian Hackett <bhackett1024@gmail.com>
Date: Mon, 25 Feb 2013 15:31:49 -0700
Subject: [PATCH 60/64] Bug 841530 - Tweaks to fit JIT inspector after the
 decompilerectomy, r=pierron.

---
 js/src/jsopcode.cpp            | 6 +++---
 js/src/methodjit/StubCalls.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 6db6afe0a43..f9c3de6971a 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -1226,9 +1226,6 @@ ExpressionDecompiler::decompilePC(jsbytecode *pc)
 
     JSOp op = (JSOp)*pc;
 
-    // None of these stack-writing ops generates novel values.
-    JS_ASSERT(op != JSOP_CASE && op != JSOP_DUP && op != JSOP_DUP2);
-
     if (const char *token = CodeToken[op]) {
         // Handle simple cases of binary and unary operators.
         switch (js_CodeSpec[op].nuses) {
@@ -2257,6 +2254,9 @@ GetPCCountJSON(JSContext *cx, const ScriptAndCounts &sac, StringBuffer &buf)
 
     buf.append(str);
 
+    AppendJSONProperty(buf, "line");
+    NumberValueToStringBuffer(cx, Int32Value(script->lineno), buf);
+
     AppendJSONProperty(buf, "opcodes");
     buf.append('[');
     bool comma = false;
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index 496a6a59a15..40d762f2f13 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -778,7 +778,7 @@ stubs::TriggerIonCompile(VMFrame &f)
     AssertCanGC();
     RootedScript script(f.cx, f.script());
 
-    if (ion::js_IonOptions.parallelCompilation) {
+    if (ion::js_IonOptions.parallelCompilation && !f.cx->runtime->profilingScripts) {
         if (script->hasIonScript()) {
             /*
              * Normally TriggerIonCompile is not called if !script->ion, but the

From ad3f82f762586a11dacca06d7c975e2409671edb Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 25 Feb 2013 18:21:08 -0500
Subject: [PATCH 61/64] Backed out changeset ea8134dfa481 (bug 843619) for
 robocop failures.

---
 mobile/android/base/Makefile.in               |  11 ++++
 mobile/android/base/TabsPanel.java            |  52 +++++++++++++++++-
 .../ic_menu_new_private_tab_small.png         | Bin 0 -> 424 bytes
 .../drawable-hdpi/ic_menu_new_tab_small.png   | Bin 0 -> 225 bytes
 .../drawable-large-hdpi-v11/tabs_menu.png     | Bin 0 -> 118 bytes
 .../drawable-large-mdpi-v11/tabs_menu.png     | Bin 0 -> 103 bytes
 .../drawable-large-xhdpi-v11/tabs_menu.png    | Bin 0 -> 133 bytes
 .../ic_menu_new_private_tab_small.png         | Bin 0 -> 308 bytes
 .../drawable-mdpi/ic_menu_new_tab_small.png   | Bin 0 -> 175 bytes
 .../ic_menu_new_private_tab_small.png         | Bin 0 -> 637 bytes
 .../drawable-xhdpi/ic_menu_new_tab_small.png  | Bin 0 -> 327 bytes
 .../tabs_panel_footer.xml                     |  17 +++++-
 .../resources/layout/tabs_panel_header.xml    |   9 +++
 .../base/resources/menu-v11/tabs_menu.xml     |  20 +++++++
 .../android/base/resources/menu/tabs_menu.xml |  20 +++++++
 15 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab_small.png
 create mode 100644 mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab_small.png
 create mode 100644 mobile/android/base/resources/drawable-large-hdpi-v11/tabs_menu.png
 create mode 100644 mobile/android/base/resources/drawable-large-mdpi-v11/tabs_menu.png
 create mode 100644 mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_menu.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab_small.png
 create mode 100644 mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab_small.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab_small.png
 create mode 100644 mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab_small.png
 create mode 100644 mobile/android/base/resources/menu-v11/tabs_menu.xml
 create mode 100644 mobile/android/base/resources/menu/tabs_menu.xml

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 99a24db12d6..f2baebcd34a 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -556,7 +556,9 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/ic_menu_close_all_tabs.png \
   res/drawable-mdpi/ic_menu_forward.png \
   res/drawable-mdpi/ic_menu_new_private_tab.png \
+  res/drawable-mdpi/ic_menu_new_private_tab_small.png \
   res/drawable-mdpi/ic_menu_new_tab.png \
+  res/drawable-mdpi/ic_menu_new_tab_small.png \
   res/drawable-mdpi/ic_menu_reload.png \
   res/drawable-mdpi/ic_status_logo.png \
   res/drawable-mdpi/progress_spinner_1.png \
@@ -667,7 +669,9 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/ic_menu_close_all_tabs.png \
   res/drawable-hdpi/ic_menu_forward.png \
   res/drawable-hdpi/ic_menu_new_private_tab.png \
+  res/drawable-hdpi/ic_menu_new_private_tab_small.png \
   res/drawable-hdpi/ic_menu_new_tab.png \
+  res/drawable-hdpi/ic_menu_new_tab_small.png \
   res/drawable-hdpi/ic_menu_reload.png \
   res/drawable-hdpi/ic_status_logo.png \
   res/drawable-hdpi/tab_indicator_divider.9.png \
@@ -758,7 +762,9 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/ic_menu_close_all_tabs.png \
   res/drawable-xhdpi/ic_menu_forward.png \
   res/drawable-xhdpi/ic_menu_new_private_tab.png \
+  res/drawable-xhdpi/ic_menu_new_private_tab_small.png \
   res/drawable-xhdpi/ic_menu_new_tab.png \
+  res/drawable-xhdpi/ic_menu_new_tab_small.png \
   res/drawable-xhdpi/ic_menu_reload.png \
   res/drawable-xhdpi/ic_status_logo.png \
   res/drawable-xhdpi/spinner_default.9.png \
@@ -906,6 +912,7 @@ RES_DRAWABLE_LARGE_MDPI_V11 = \
   res/drawable-large-mdpi-v11/tabs_carat.png \
   res/drawable-large-mdpi-v11/tabs_carat_contracted.png \
   res/drawable-large-mdpi-v11/tabs_carat_expanded.png \
+  res/drawable-large-mdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_HDPI_V11 = \
@@ -915,6 +922,7 @@ RES_DRAWABLE_LARGE_HDPI_V11 = \
   res/drawable-large-hdpi-v11/tabs_carat.png \
   res/drawable-large-hdpi-v11/tabs_carat_contracted.png \
   res/drawable-large-hdpi-v11/tabs_carat_expanded.png \
+  res/drawable-large-hdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_XHDPI_V11 = \
@@ -924,6 +932,7 @@ RES_DRAWABLE_LARGE_XHDPI_V11 = \
   res/drawable-large-xhdpi-v11/tabs_carat.png \
   res/drawable-large-xhdpi-v11/tabs_carat_contracted.png \
   res/drawable-large-xhdpi-v11/tabs_carat_expanded.png \
+  res/drawable-large-xhdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_MDPI_V11 = \
@@ -958,8 +967,10 @@ RES_COLOR = \
 RES_MENU = \
   res/menu/awesomebar_contextmenu.xml \
   res/menu/gecko_app_menu.xml \
+  res/menu/tabs_menu.xml \
   res/menu/titlebar_contextmenu.xml \
   res/menu/abouthome_topsites_contextmenu.xml \
+  res/menu-v11/tabs_menu.xml \
   $(NULL)
 
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
diff --git a/mobile/android/base/TabsPanel.java b/mobile/android/base/TabsPanel.java
index 8cbac4a090e..9b3dcffc472 100644
--- a/mobile/android/base/TabsPanel.java
+++ b/mobile/android/base/TabsPanel.java
@@ -27,7 +27,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 public class TabsPanel extends LinearLayout
-                       implements LightweightTheme.OnChangeListener,
+                       implements GeckoPopupMenu.OnMenuItemClickListener,
+                                  LightweightTheme.OnChangeListener,
                                   IconTabWidget.OnTabChangedListener {
     private static final String LOGTAG = "GeckoTabsPanel";
 
@@ -60,12 +61,16 @@ public class TabsPanel extends LinearLayout
     private TabsLayoutChangeListener mLayoutChangeListener;
 
     private IconTabWidget mTabWidget;
+    private static ImageButton mMenuButton;
     private static ImageButton mAddTab;
 
     private Panel mCurrentPanel;
     private boolean mIsSideBar;
     private boolean mVisible;
 
+    private GeckoPopupMenu mPopupMenu;
+    private Menu mMenu;
+
     public TabsPanel(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
@@ -80,6 +85,11 @@ public class TabsPanel extends LinearLayout
 
         mIsSideBar = false;
 
+        mPopupMenu = new GeckoPopupMenu(context);
+        mPopupMenu.inflate(R.menu.tabs_menu);
+        mPopupMenu.setOnMenuItemClickListener(this);
+        mMenu = mPopupMenu.getMenu();
+
         LayoutInflater.from(context).inflate(R.layout.tabs_panel, this);
         initialize();
     }
@@ -110,6 +120,15 @@ public class TabsPanel extends LinearLayout
         mTabWidget.addTab(R.drawable.tabs_private);
         mTabWidget.addTab(R.drawable.tabs_synced);
         mTabWidget.setTabSelectionListener(this);
+
+        mMenuButton = (ImageButton) findViewById(R.id.menu);
+        mMenuButton.setOnClickListener(new Button.OnClickListener() {
+            public void onClick(View view) {
+                TabsPanel.this.openTabsMenu();
+            }
+        });
+
+        mPopupMenu.setAnchor(mMenuButton);
     }
 
     public void addTab() {
@@ -121,6 +140,15 @@ public class TabsPanel extends LinearLayout
         mActivity.autoHideTabs();
     }
 
+    public void openTabsMenu() {
+        if (mCurrentPanel == Panel.REMOTE_TABS)
+            mMenu.findItem(R.id.close_all_tabs).setEnabled(false);
+        else
+            mMenu.findItem(R.id.close_all_tabs).setEnabled(true); 
+
+        mPopupMenu.show();
+    }
+
     @Override
     public void onTabChanged(int index) {
         if (index == 0)
@@ -131,6 +159,25 @@ public class TabsPanel extends LinearLayout
             show(Panel.REMOTE_TABS, false);
     }
 
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.close_all_tabs:
+                for (Tab tab : Tabs.getInstance().getTabsInOrder()) {
+                    Tabs.getInstance().closeTab(tab);
+                }
+                autoHidePanel();
+                return true;
+
+            case R.id.new_tab:
+            case R.id.new_private_tab:
+                hide();
+            // fall through
+            default:
+                return mActivity.onOptionsItemSelected(item);
+        }
+    }
+
     private static int getTabContainerHeight(TabsListContainer listContainer) {
         Context context = listContainer.getContext();
 
@@ -310,12 +357,14 @@ public class TabsPanel extends LinearLayout
                 mFooter.setVisibility(View.GONE);
 
             mAddTab.setVisibility(View.INVISIBLE);
+            mMenuButton.setVisibility(View.INVISIBLE);
         } else {
             if (mFooter != null)
                 mFooter.setVisibility(View.VISIBLE);
 
             mAddTab.setVisibility(View.VISIBLE);
             mAddTab.setImageLevel(index);
+            mMenuButton.setVisibility(View.VISIBLE);
         }
 
         if (shouldResize) {
@@ -333,6 +382,7 @@ public class TabsPanel extends LinearLayout
     public void hide() {
         if (mVisible) {
             mVisible = false;
+            mPopupMenu.dismiss();
             dispatchLayoutChange(0, 0);
 
             if (mPanel != null) {
diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab_small.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_private_tab_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9bb94084f782a0e40df286325a99365138162ea
GIT binary patch
literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`1|-Ad1@1F2Fy?!@IEGZ*dV71L*Wmz(qaRy#
zyj+qU{!x@AeEK(4nUaFnVO&-}S$36Aa1s|kXntYs<mL;pnmcFnbu9|A?=NWcev#n8
zV*gI^-;$qs?>;n7+p_fR8J(Lg;&BxZTgB~C|J?icF#d|Gs!>?cw5>Pnj|#`F^kL0E
zEd-RVzx8mV!|sfhcNfL`r@vs-t+0Dk%KANb_fcU}Xa5sfUry9=pZ{T=!dvyRhyUU&
z?Oo32Pk$@2bC$oj=1b51hcyk?ETf&nKibV(UsTJ?Yq9@ZkNu-RBBB>-R&UBTj*50n
zpEJMWSoxyswGPQ8J-?>b)}A}Q=iH9<kHyZn#jL(Pf$jPaCf}?>=L6r#oi8eBShnZ+
z{?8v-ce&1=<6jxOZu|B_-1>Vy9QrRLUw`w(8lh6@hqi}q{|QN-Cv10dd2L45`-Kk#
z?A&edzJmG`>|F%0Z>zjqd&q~Y`mWFCr0OoSm*xPO1~fADzJBVqcdLy)Tmi-agQu&X
J%Q~loCIGnZ%j*CD

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab_small.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_new_tab_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d042fa93aa96a40b54143ee512d5f141b21f99
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`1|-Ad1?~f>6`n4RAr-gY-Ztc7Rupi!xOZN4
zr$}behXu!H_y`Id3cKiVB>YcRg#t&joZ!aX4`5*ZIRE=`eXYo|k7CcBdLmih{r*GT
zT~_(<gNM;Ueee6z$BwRwlsr`aW75^Ynl&<imL1>M`{?`{U5@&+<*WJR&_Ug;!;iOd
q|2uQ*`KH28Jo9-UJOqKq6^#41yq4q(>%9fKnZeW5&t;ucLK6U3=4JN)

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_menu.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tabs_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd36e743446db030757f523827c02126a454f312
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBY&~5ZLn>~)y}FQ-!GVYQ!2SAW
zzu9>KffXw(1nZSl^iQs2_{(xtL;(oAd6!&qaBx`1?6I=3p&^F-f*SA6b5n|zyQZfB
P4Px+g^>bP0l+XkKIU^&~

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/tabs_menu.png b/mobile/android/base/resources/drawable-large-mdpi-v11/tabs_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c1b42cd78a1e0c3341ffcd21b7ece54236f20b0
GIT binary patch
literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjdY&$hAr-gYURub@z`$|9;NSm-
z?Dpf%3NvS{i)2_lmvNK&2lj$sM)Oi2j%DO}f8<%-zAiIapiTx)S3j3^P6<r_j;|kx

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_menu.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..c45f8c671cbbc41f8510e44ea40c57bc021fb8fe
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCA5Ry@kcwMxuWjUIaNuCxc)y-`
z8Lzg&E_XenhS@LTCaq^L;0>6}2vi9K9-KhJ9Aq8?gMuoM*dqXDH_QQ=cw;T&f_F0?
TrC2Nq0SS7#`njxgN@xNA(##+P

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab_small.png b/mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..8242f7fb4a14af965b321b677021adcf129bddd7
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*40002{Nkl<Zc-rmR
zu}Z^G6o>IXgk9=bUqT;3mu?jV<6wQ7<Xt+7lEK|V5jVj>LE5ED+e`5D8_tkHf&uZQ
z<v;wmaB~UYaxdYgXJ&grq2Zxd*=>^?mCJv4-kHz@bE(UrR=2OABOK!rQ!KE;laC9Z
zA7g+~RH(HT6}oI0x{L~)VUBYg;RY4V$7}R);p?8GLJNH0wDzt?7#?bKXZS=B6?%dV
z%!5mO!F()z-hACKB-Gu(eqj=Rjv~V=)_B7`-m$?8G9CB|Rp@_(`Zwej7Ho^WDfAoG
z5!FG27D%vQ359mOLKUh|g(_5`3RS2sa{u^hTt6EW+SU#(BCPi-*`KKZ0000<MNUMn
GLSTY5H-^0c

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab_small.png b/mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d1453d1ccb8afffdc5446dd3de1a677c2f10dbd
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^S|H591|*LjJ{b+9$~;{hLn>~)y=lmGK!L~Y;k_-+
z)8*XzvnTvJ`{06Oi_^i7dmonR+*k70<oV0hVY&17$1+p*-13@RDY2q5D>7xpJVsV7
z5siQa4vp)0bL&q$$}BqSt^DGtrbj7f#y1^?OMA|&W``<ZN}c%oW7eEx<_p{Jn&10&
Vk#&~P9H0vrJYD@<);T3K0RZP?MZ^FA

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab_small.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_private_tab_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..698f8e17618e771b0a54129be2b7056bfad5dc95
GIT binary patch
literal 637
zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r9PWFu8cTIEGZ*dVAN<TRKtZ_(!jH
zzC}$F4tjdK#yeS+zF61Ml)XUf#>xlJ7A$pQ<<?W}5^-JAx=3jslY4x_g&iU+f!<4&
zx;YAo%h%8NKS8dX-EtlK+t0H5PT&3C_d!vyod4mc6PE6p&ukeMG%$HJ{A*s&y7A<i
z?C|)jTZ^u3&CNdlW9uLB1*=cFZsE%K9Gc{y-C#Dqn>)aPk#$R)UP^R#)xxkV6IZR0
z{_3l{f`3)Y?NzT%q{Xi~u9Y$IGuxE}wvg$kR)2rxva@CG>dL9xi}_YL&v%Fw`^ge@
zmSM{y;TP|D9O{3uRLx<0Q9j>+pQ%{YbltAd^;K)nJ>J)n^K7Q9@j|c0nYHsB>`l+`
zxSz2J4Oe`=C&X6pIFH#G(OM?itQnErGov{zpBJ6^Q+4>x3jYQEOz-!_P7T*>+_`Z=
z@jkAdiWTd&F?)Bcz1I*`toV6(mcQ<*%&n3}n-hPF<$g0sNjrGF`e#__vY1n`EBxL&
ztQ9PsuJmlK)VJELFJrqFY}UDdb#~BpPsO)4%-6L4i`=iZ$~iR5^s94ipz*7<w*vR)
z#NSM_UuAdyx^rX#n+PaSV8nl+6@S?_uh2R*aaFX=%55qOqFEUh|C+<HC5%CDRn+GN
z3y!j7occJ?f4fw?*UN1)zii6%j1^_5IiWKxR9gJo9Zg0q4Pbl_NqjnyAeY6Pak+HG
w+5?Yu^KzrF^~XN%XZ*38)qxY}sIU8~6;6sPN5A&E1WZ;8p00i_>zopr0M+IefB*mh

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab_small.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_new_tab_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..764c9de091e515763c323374e482c8c7b337e05a
GIT binary patch
literal 327
zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r9PWF!Fi2IEGZ*dV6;xSCfOpfsb(u
zs*XrURV~QLTBTTHUA*b#FAiDJDTi0o9hN`hS*I|spl16?%hd_>{0t%*0gQj0E|gfT
zyQ{a$J$K6QTmSCmJx%|~dBJ;%`!0sL@y3j|faE+bjerFXjZCauKn?gAVhnG;C(LV$
zEvUNg61pXpDN4N|Id*zO8RwmdyEOqBlNojAgzw9l+aGi@&wILW=ob%$cDaj|x1w(R
z4rU^3I>ZIa&AeOLtajIixSwa-w11twLD}7d41Q4zT0p1$tJODt>TGtQRT3CJ3=E#G
KelF{r5}E)Bo^%8N

literal 0
HcmV?d00001

diff --git a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
index 364dad861af..41bba53d8c1 100644
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel_footer.xml
@@ -6,12 +6,23 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ImageButton android:id="@+id/add_tab"
-                 android:layout_width="fill_parent"
+                 android:layout_width="@dimen/browser_toolbar_height"
                  android:layout_height="@dimen/browser_toolbar_height"
                  android:padding="14dip"
                  android:src="@drawable/tab_new_level"
                  android:contentDescription="@string/new_tab"
-                 android:background="@drawable/action_bar_button"
-                 android:gravity="center"/>
+                 android:background="@drawable/action_bar_button"/>
+
+    <View android:layout_width="0dip"
+          android:layout_height="@dimen/browser_toolbar_height"
+          android:layout_weight="1.0"/>
+
+    <ImageButton android:id="@+id/menu"
+                 android:layout_width="@dimen/browser_toolbar_height"
+                 android:layout_height="@dimen/browser_toolbar_height"
+                 android:padding="14dip"
+                 android:src="@drawable/tabs_menu"
+                 android:contentDescription="@string/menu"
+                 android:background="@drawable/action_bar_button"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/tabs_panel_header.xml b/mobile/android/base/resources/layout/tabs_panel_header.xml
index 167fadad53a..b754aa7082f 100644
--- a/mobile/android/base/resources/layout/tabs_panel_header.xml
+++ b/mobile/android/base/resources/layout/tabs_panel_header.xml
@@ -24,4 +24,13 @@
                  android:contentDescription="@string/new_tab"
                  android:background="@drawable/action_bar_button"/>
 
+    <ImageButton android:id="@+id/menu"
+                 style="@style/AddressBar.ImageButton"
+                 android:layout_width="@dimen/browser_toolbar_height"
+                 android:layout_height="@dimen/browser_toolbar_height"
+                 android:padding="@dimen/browser_toolbar_button_padding"
+                 android:src="@drawable/menu"
+                 android:contentDescription="@string/menu"
+                 android:background="@drawable/action_bar_button"/>
+
 </merge>
diff --git a/mobile/android/base/resources/menu-v11/tabs_menu.xml b/mobile/android/base/resources/menu-v11/tabs_menu.xml
new file mode 100644
index 00000000000..7809faa450c
--- /dev/null
+++ b/mobile/android/base/resources/menu-v11/tabs_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/new_tab"
+          android:icon="@drawable/ic_menu_new_tab"
+          android:title="@string/new_tab"/>
+
+    <item android:id="@+id/new_private_tab"
+          android:icon="@drawable/ic_menu_new_private_tab"
+          android:title="@string/new_private_tab"/>
+
+    <item android:id="@+id/close_all_tabs"
+          android:icon="@drawable/ic_menu_close_all_tabs"
+          android:title="@string/close_all_tabs"/>
+
+</menu>
diff --git a/mobile/android/base/resources/menu/tabs_menu.xml b/mobile/android/base/resources/menu/tabs_menu.xml
new file mode 100644
index 00000000000..56d272a5eb3
--- /dev/null
+++ b/mobile/android/base/resources/menu/tabs_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/new_tab"
+          android:icon="@drawable/ic_menu_new_tab_small"
+          android:title="@string/new_tab"/>
+
+    <item android:id="@+id/new_private_tab"
+          android:icon="@drawable/ic_menu_new_private_tab_small"
+          android:title="@string/new_private_tab"/>
+
+    <item android:id="@+id/close_all_tabs"
+          android:icon="@drawable/ic_menu_close_all_tabs"
+          android:title="@string/close_all_tabs"/>
+
+</menu>

From 1c839957d4ea7d6a895ba124d84a9ddadef4a810 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 25 Feb 2013 19:49:19 -0500
Subject: [PATCH 62/64] Backed out changeset 71a93fff7311 (bug 840360) for B2G
 reftest/crashtest bustage on a CLOSED TREE.

---
 browser/devtools/shared/Browser.jsm           | 74 +++++++++++++++++--
 .../shared/test/browser_browser_basic.js      | 11 ++-
 layout/tools/reftest/reftest-content.js       | 37 +++++++++-
 toolkit/modules/Makefile.in                   |  1 -
 toolkit/modules/Timer.jsm                     | 41 ----------
 toolkit/modules/tests/xpcshell/test_timer.js  | 28 -------
 toolkit/modules/tests/xpcshell/xpcshell.ini   |  1 -
 7 files changed, 113 insertions(+), 80 deletions(-)
 delete mode 100644 toolkit/modules/Timer.jsm
 delete mode 100644 toolkit/modules/tests/xpcshell/test_timer.js

diff --git a/browser/devtools/shared/Browser.jsm b/browser/devtools/shared/Browser.jsm
index 49e0a194728..8ae927c2b03 100644
--- a/browser/devtools/shared/Browser.jsm
+++ b/browser/devtools/shared/Browser.jsm
@@ -20,9 +20,73 @@ this.EXPORTED_SYMBOLS = [ "Node", "HTMLElement", "setTimeout", "clearTimeout" ];
 this.Node = Components.interfaces.nsIDOMNode;
 this.HTMLElement = Components.interfaces.nsIDOMHTMLElement;
 
-/*
- * Import and re-export the timeout functions from Timer.jsm.
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+/**
+ * The next value to be returned by setTimeout
  */
-let Timer = Components.utils.import("resource://gre/modules/Timer.jsm", {});
-this.setTimeout = Timer.setTimeout;
-this.clearTimeout = Timer.clearTimeout;
+let nextID = 1;
+
+/**
+ * The map of outstanding timeouts
+ */
+const timers = {};
+
+/**
+ * Object to be passed to Timer.initWithCallback()
+ */
+function TimerCallback(callback) {
+  this._callback = callback;
+  const interfaces = [ Components.interfaces.nsITimerCallback ];
+  this.QueryInterface = XPCOMUtils.generateQI(interfaces);
+}
+
+TimerCallback.prototype.notify = function(timer) {
+  try {
+    for (let timerID in timers) {
+      if (timers[timerID] === timer) {
+        delete timers[timerID];
+        break;
+      }
+    }
+    this._callback.apply(null, []);
+  }
+  catch (ex) {
+    dump(ex +  '\n');
+  }
+};
+
+/**
+ * Executes a code snippet or a function after specified delay.
+ * This is designed to have the same interface contract as the browser
+ * function.
+ * @param callback is the function you want to execute after the delay.
+ * @param delay is the number of milliseconds that the function call should
+ * be delayed by. Note that the actual delay may be longer, see Notes below.
+ * @return the ID of the timeout, which can be used later with
+ * window.clearTimeout.
+ */
+this.setTimeout = function setTimeout(callback, delay) {
+  const timer = Components.classes["@mozilla.org/timer;1"]
+                        .createInstance(Components.interfaces.nsITimer);
+
+  let timerID = nextID++;
+  timers[timerID] = timer;
+
+  timer.initWithCallback(new TimerCallback(callback), delay, timer.TYPE_ONE_SHOT);
+  return timerID;
+};
+
+/**
+ * Clears the delay set by window.setTimeout() and prevents the callback from
+ * being executed (if it hasn't been executed already)
+ * @param timerID the ID of the timeout you wish to clear, as returned by
+ * window.setTimeout().
+ */
+this.clearTimeout = function clearTimeout(timerID) {
+  let timer = timers[timerID];
+  if (timer) {
+    timer.cancel();
+    delete timers[timerID];
+  }
+};
diff --git a/browser/devtools/shared/test/browser_browser_basic.js b/browser/devtools/shared/test/browser_browser_basic.js
index d9b3984b0e7..4276672055c 100644
--- a/browser/devtools/shared/test/browser_browser_basic.js
+++ b/browser/devtools/shared/test/browser_browser_basic.js
@@ -19,10 +19,19 @@ function test() {
 }
 
 function runTest(browser, tab, document) {
+  let timeout = imported.setTimeout(shouldNotBeCalled, 100);
+  imported.clearTimeout(timeout);
+
   var p = document.getElementById("id");
 
   ok(p instanceof imported.Node, "Node correctly defined");
   ok(p instanceof imported.HTMLElement, "HTMLElement correctly defined");
 
-  finish();
+  let timeout = imported.setTimeout(function() {
+    finish();
+  }, 100);
+}
+
+function shouldNotBeCalled() {
+  ok(false, "Timeout cleared");
 }
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index 014dfcc1b1a..3e78eddc6c7 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -7,7 +7,40 @@
 const CC = Components.classes;
 const CI = Components.interfaces;
 const CR = Components.results;
-const CU = Components.utils;
+
+/**
+ * FIXME/bug 622224: work around lack of reliable setTimeout available
+ * to frame scripts.
+ */
+// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4
+// days.  Should be fine as a temporary workaround.
+var gNextTimeoutId = 0;
+var gTimeoutTable = { };        // int -> nsITimer
+
+function setTimeout(callbackFn, delayMs) {
+    var id = gNextTimeoutId++;
+    var timer = CC["@mozilla.org/timer;1"].createInstance(CI.nsITimer);
+    timer.initWithCallback({
+        notify: function notify_callback() {
+                    clearTimeout(id);
+                    callbackFn();
+                }
+        },
+        delayMs,
+        timer.TYPE_ONE_SHOT);
+
+    gTimeoutTable[id] = timer;
+
+    return id;
+}
+
+function clearTimeout(id) {
+    var timer = gTimeoutTable[id];
+    if (timer) {
+        timer.cancel();
+        delete gTimeoutTable[id];
+    }
+}
 
 const XHTML_NS = "http://www.w3.org/1999/xhtml";
 
@@ -17,8 +50,6 @@ const PRINTSETTINGS_CONTRACTID = "@mozilla.org/gfx/printsettings-service;1";
 // "<!--CLEAR-->"
 const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
-CU.import("resource://gre/modules/Timer.jsm");
-
 var gBrowserIsRemote;
 var gHaveCanvasSnapshot = false;
 // Plugin layers can be updated asynchronously, so to make sure that all
diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in
index 60554c16423..4f434134570 100644
--- a/toolkit/modules/Makefile.in
+++ b/toolkit/modules/Makefile.in
@@ -15,7 +15,6 @@ EXTRA_JS_MODULES := \
   NewTabUtils.jsm \
   Sqlite.jsm \
   TelemetryTimestamps.jsm \
-  Timer.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/modules/Timer.jsm b/toolkit/modules/Timer.jsm
deleted file mode 100644
index fcca537f2f2..00000000000
--- a/toolkit/modules/Timer.jsm
+++ /dev/null
@@ -1,41 +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/. */
-
-"use strict";
-
-/**
- * JS module implementation of nsIDOMJSWindow.setTimeout and clearTimeout.
- */
-
-this.EXPORTED_SYMBOLS = ["setTimeout", "clearTimeout"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
-let gNextTimeoutId = 1; // setTimeout must return a positive integer
-
-let gTimeoutTable = new Map(); // int -> nsITimer
-
-function setTimeout(aCallback, aMilliseconds) {
-  let id = gNextTimeoutId++;
-  let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-  timer.initWithCallback(function setTimeout_timer() {
-    gTimeoutTable.delete(id);
-    aCallback();
-  }, aMilliseconds, timer.TYPE_ONE_SHOT);
-
-  gTimeoutTable.set(id, timer);
-  return id;
-}
-
-function clearTimeout(aId) {
-  if (gTimeoutTable.has(aId)) {
-    gTimeoutTable.get(aId).cancel();
-    gTimeoutTable.delete(aId);
-  }
-}
diff --git a/toolkit/modules/tests/xpcshell/test_timer.js b/toolkit/modules/tests/xpcshell/test_timer.js
deleted file mode 100644
index 57981bc7585..00000000000
--- a/toolkit/modules/tests/xpcshell/test_timer.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Tests exports from Timer.jsm
-
-let imported = {};
-Components.utils.import("resource://gre/modules/Timer.jsm", imported);
-
-function run_test(browser, tab, document) {
-  do_test_pending();
-
-  let timeout1 = imported.setTimeout(function() do_throw("Should not be called"), 100);
-  do_check_eq(typeof timeout1, "number", "setTimeout returns a number");
-  do_check_true(timeout1 > 0, "setTimeout returns a positive number");
-
-  let timeout2 = imported.setTimeout(function() {
-    do_check_true(true, "Should be called");
-    do_test_finished();
-  }, 100);
-
-  do_check_eq(typeof timeout2, "number", "setTimeout returns a number");
-  do_check_true(timeout2 > 0, "setTimeout returns a positive number");
-  do_check_neq(timeout1, timeout2, "Calling setTimeout again returns a different value");
-
-  imported.clearTimeout(timeout1);
-}
diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini
index de3b2dcac6e..1255e7d635e 100644
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -5,4 +5,3 @@ tail =
 [test_newtab-migrate-v1.js]
 [test_sqlite.js]
 [test_TelemetryTimestamps.js]
-[test_timer.js]

From bfbd6dcfd32ba304289aebac367b8778a910a89c Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Mon, 25 Feb 2013 17:40:13 -0800
Subject: [PATCH 63/64] Bug 844403 - Make VectorImage cancel all listeners when
 destroyed. r=dholbert

---
 image/src/VectorImage.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/image/src/VectorImage.cpp b/image/src/VectorImage.cpp
index c1a4d0e47e7..f4433c860cb 100644
--- a/image/src/VectorImage.cpp
+++ b/image/src/VectorImage.cpp
@@ -302,6 +302,7 @@ VectorImage::VectorImage(imgStatusTracker* aStatusTracker,
 
 VectorImage::~VectorImage()
 {
+  CancelAllListeners();
 }
 
 //------------------------------------------------------------------------------
@@ -899,9 +900,6 @@ VectorImage::OnSVGDocumentParsed()
 void
 VectorImage::CancelAllListeners()
 {
-  NS_ABORT_IF_FALSE(mParseCompleteListener, "Should have the parse complete listener");
-  NS_ABORT_IF_FALSE(mLoadEventListener, "Should have the load event listener");
-
   if (mParseCompleteListener) {
     mParseCompleteListener->Cancel();
     mParseCompleteListener = nullptr;

From 27508912b99f245effe51fb892e46a4b199af77b Mon Sep 17 00:00:00 2001
From: "Zuhao(Joe) Chen" <joejoevictor@gmail.com>
Date: Mon, 25 Feb 2013 19:52:36 -0800
Subject: [PATCH 64/64] Bug 805811 - Support bootstrapping with MacPorts; r=gps

DONTBUILD (NPOTB)
---
 python/mozboot/mozboot/base.py |  21 +++++
 python/mozboot/mozboot/osx.py  | 147 +++++++++++++++++++++++++++------
 2 files changed, 145 insertions(+), 23 deletions(-)

diff --git a/python/mozboot/mozboot/base.py b/python/mozboot/mozboot/base.py
index 66b998f920f..06b8ab22299 100644
--- a/python/mozboot/mozboot/base.py
+++ b/python/mozboot/mozboot/base.py
@@ -72,3 +72,24 @@ class BaseBootstrapper(object):
             raise e
 
         return output
+
+    def prompt_int(self, prompt, low, high, limit=5):
+        ''' Prompts the user with prompt and requires an integer between low and high. '''
+        valid = False
+        while not valid and limit > 0:
+            try:
+                choice = int(raw_input(prompt))
+                if not low <= choice <= high:
+                    print("ERROR! Please enter a valid option!")
+                    limit -= 1
+                else:
+                    valid = True
+            except ValueError:
+                print("ERROR! Please enter a valid option!")
+                limit -= 1
+
+        if limit > 0:
+            return choice
+        else:
+            raise Exception("Error! Reached max attempts of entering option.")
+
diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py
index eb2e7406b36..72bafb7d9fb 100644
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -20,6 +20,10 @@ XCODE_APP_STORE = 'macappstore://itunes.apple.com/app/id497799835?mt=12'
 XCODE_LEGACY = 'https://developer.apple.com/downloads/download.action?path=Developer_Tools/xcode_3.2.6_and_ios_sdk_4.3__final/xcode_3.2.6_and_ios_sdk_4.3.dmg'
 HOMEBREW_AUTOCONF213 = 'https://raw.github.com/Homebrew/homebrew-versions/master/autoconf213.rb'
 
+MACPORTS_URL = {'8': 'https://distfiles.macports.org/MacPorts/MacPorts-2.1.3-10.8-MountainLion.pkg',
+                '7': 'https://distfiles.macports.org/MacPorts/MacPorts-2.1.3-10.7-Lion.pkg',
+                '6': 'https://distfiles.macports.org/MacPorts/MacPorts-2.1.3-10.6-SnowLeopard.pkg',}
+
 RE_CLANG_VERSION = re.compile('Apple (?:clang|LLVM) version (\d+\.\d+)')
 
 APPLE_CLANG_MINIMUM_VERSION = StrictVersion('4.0')
@@ -56,23 +60,55 @@ An old version of the Xcode command line tools is installed. You will need to
 install a newer version in order to compile Firefox.
 '''
 
-HOMEBREW_INSTALL = '''
-We will install the Homebrew package manager to install required packages.
+PACKAGE_MANAGER_INSTALL = '''
+We will install the %s package manager to install required packages.
 
-You will be prompted to install Homebrew with its default settings. If you
-would prefer to do this manually, hit CTRL+c, install Homebrew yourself, ensure
-"brew" is in your $PATH, and relaunch bootstrap.
+You will be prompted to install %s with its default settings. If you
+would prefer to do this manually, hit CTRL+c, install %s yourself, ensure
+"%s" is in your $PATH, and relaunch bootstrap.
 '''
 
-HOMEBREW_PACKAGES = '''
-We are now installing all required packages via Homebrew. You will see a lot of
+PACKAGE_MANAGER_PACKAGES = '''
+We are now installing all required packages via %s. You will see a lot of
 output as packages are built.
 '''
 
-HOMEBREW_OLD_CLANG = '''
+PACKAGE_MANAGER_OLD_CLANG = '''
 We require a newer compiler than what is provided by your version of Xcode.
 
-We will install a modern version of Clang through Homebrew.
+We will install a modern version of Clang through %s.
+'''
+
+PACKAGE_MANAGER_CHOICE = '''
+Please choose a package manager you'd like:
+1. Homebrew
+2. MacPorts
+Your choice:
+'''
+
+NO_PACKAGE_MANAGER_WARNING = '''
+It seems you don't have any supported package manager installed.
+'''
+
+PACKAGE_MANAGER_EXISTS = '''
+Looks like you have %s installed. We will install all required packages via %s.
+'''
+
+MULTI_PACKAGE_MANAGER_EXISTS = '''
+It looks like you have multiple package managers installed.
+'''
+
+# May add support for other package manager on os x.
+PACKAGE_MANAGER = {'Homebrew': 'brew',
+                   'MacPorts': 'port'}
+
+PACKAGE_MANAGER_CHOICES = ['Homebrew', 'MacPorts']
+
+MACPORTS_POSTINSTALL_RESTART_REQUIRED = '''
+MacPorts was installed successfully. However, you'll need to start a new shell
+to pick up the environment changes so MacPorts can be found by your tools.
+
+Please start a new shell or terminal window and run this bootstrapper again.
 '''
 
 
@@ -85,10 +121,13 @@ class OSXBootstrapper(BaseBootstrapper):
         if self.os_version < StrictVersion('10.6'):
             raise Exception('OS X 10.6 or above is required.')
 
+        self.minor_version = version.split('.')[1]
+
     def install_system_packages(self):
         self.ensure_xcode()
-        self.ensure_homebrew()
-        self.ensure_homebrew_packages()
+
+        choice = self.ensure_package_manager()
+        getattr(self, 'ensure_%s_packages' % choice)()
 
     def ensure_xcode(self):
         if self.os_version < StrictVersion('10.7'):
@@ -138,18 +177,6 @@ class OSXBootstrapper(BaseBootstrapper):
                 print(INSTALL_XCODE_COMMAND_LINE_TOOLS_STEPS)
                 sys.exit(1)
 
-    def ensure_homebrew(self):
-        if self.which('brew') is not None:
-            return
-
-        print(HOMEBREW_INSTALL)
-        bootstrap = urllib2.urlopen(url=HOMEBREW_BOOTSTRAP, timeout=20).read()
-        with tempfile.NamedTemporaryFile() as tf:
-            tf.write(bootstrap)
-            tf.flush()
-
-            subprocess.check_call(['ruby', tf.name])
-
     def ensure_homebrew_packages(self):
         brew = self.which('brew')
         assert brew is not None
@@ -184,3 +211,77 @@ class OSXBootstrapper(BaseBootstrapper):
 
             subprocess.check_call([brew, '-v', 'install', 'llvm',
                 '--with-clang', '--all-targets'])
+
+    def ensure_macports_packages(self):
+        port = self.which('port')
+        assert port is not None
+
+        installed = set(self.check_output([port, 'installed']).split())
+
+        packages = ['python27',
+                    'mercurial',
+                    'yasm',
+                    'libidl',
+                    'autoconf213']
+
+        missing = [package for package in packages if package not in installed]
+        if missing:
+            self.run_as_root([port, '-v', 'install'] + missing)
+
+        if self.os_version < StrictVersion('10.7') and 'llvm' not in installed:
+            print(MACPORTS_OLD_CLANG)
+            self.run_as_root([port, '-v', 'install', 'llvm'])
+
+    def ensure_package_manager(self):
+        '''
+        Search package mgr in sys.path, if none is found, prompt the user to install one.
+        If only one is found, use that one. If both are found, prompt the user to choose
+        one.
+        '''
+        installed = []
+        for name, cmd in PACKAGE_MANAGER.iteritems():
+            if self.which(cmd) is not None:
+                installed.append(name)
+
+        if not installed:
+            print(NO_PACKAGE_MANAGER_WARNING)
+            choice = self.prompt_int(prompt=PACKAGE_MANAGER_CHOICE, low=1, high=2)
+            getattr(self, 'install_%s' % PACKAGE_MANAGER_CHOICES[choice - 1].lower())()
+            return PACKAGE_MANAGER_CHOICES[choice - 1].lower()
+        elif len(installed) == 1:
+            print(PACKAGE_MANAGER_EXISTS % (installed[0], installed[0]))
+            return installed[0].lower()
+        else:
+            print(MULTI_PACKAGE_MANAGER_EXISTS)
+            choice = self.prompt_int(prompt=PACKAGE_MANAGER_CHOICE, low=1, high=2)
+            return PACKAGE_MANAGER_CHOICES[choice - 1].lower()
+
+    def install_homebrew(self):
+        print(PACKAGE_MANAGER_INSTALL % ('Homebrew', 'Homebrew', 'Homebrew', 'brew'))
+        bootstrap = urllib2.urlopen(url=HOMEBREW_BOOTSTRAP, timeout=20).read()
+        with tempfile.NamedTemporaryFile() as tf:
+            tf.write(bootstrap)
+            tf.flush()
+
+            subprocess.check_call(['ruby', tf.name])
+
+    def install_macports(self):
+        url = MACPORTS_URL.get(self.minor_version, None)
+        if not url:
+            raise Exception('We do not have a MacPorts install URL for your '
+                'OS X version. You will need to install MacPorts manually.')
+
+        print(PACKAGE_MANAGER_INSTALL % ('MacPorts', 'MacPorts', 'MacPorts', 'port'))
+        pkg = urllib2.urlopen(url=url, timeout=300).read()
+        with tempfile.NamedTemporaryFile(suffix='.pkg') as tf:
+            tf.write(pkg)
+            tf.flush()
+
+            self.run_as_root(['installer', '-pkg', tf.name, '-target', '/'])
+
+        # MacPorts installs itself into a location likely not on the PATH. If
+        # we can't find it, prompt to restart.
+        if self.which('port') is None:
+            print(MACPORTS_POSTINSTALL_RESTART_REQUIRED)
+            sys.exit(1)
+